diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index a268f7e25..d95cccdde 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -84,16 +84,19 @@ class ProjectsController < ApplicationController def watch_users watchers = @project.watchers.includes(:user).order("watchers.created_at asc").distinct + @watchers_count = watchers.size @watchers = paginate(watchers) end def praise_users praises = @project.praise_treads.includes(:user).order("praise_treads.created_at asc").distinct + @praises_count = praises.size @praises = paginate(praises) end def fork_users fork_users = @project.fork_users.includes(:user, :project).order("fork_users.created_at asc").distinct + @forks_count = fork_users.size @fork_users = paginate(fork_users) end diff --git a/app/views/projects/fork_users.json.jbuilder b/app/views/projects/fork_users.json.jbuilder index dae3f146b..9dca33726 100644 --- a/app/views/projects/fork_users.json.jbuilder +++ b/app/views/projects/fork_users.json.jbuilder @@ -1,4 +1,4 @@ -json.count @fork_users.size +json.count @forks_count json.fork_users do json.array! @fork_users.each do |f| user = f.user diff --git a/app/views/projects/praise_users.json.jbuilder b/app/views/projects/praise_users.json.jbuilder index 9d7cb2cdc..5225c1c09 100644 --- a/app/views/projects/praise_users.json.jbuilder +++ b/app/views/projects/praise_users.json.jbuilder @@ -1,4 +1,4 @@ -json.count @praises.size +json.count @praises_count json.praises do json.partial! "/projects/list_user", collection: @praises, as: :target end \ No newline at end of file diff --git a/app/views/projects/watch_users.json.jbuilder b/app/views/projects/watch_users.json.jbuilder index 185aea6e3..3e2dba762 100644 --- a/app/views/projects/watch_users.json.jbuilder +++ b/app/views/projects/watch_users.json.jbuilder @@ -1,4 +1,4 @@ -json.cout @watchers.size +json.cout @watchers_count json.watchers do json.partial! "/projects/list_user", collection: @watchers, as: :target end \ No newline at end of file diff --git a/app/views/watchers/index.json.jbuilder b/app/views/watchers/index.json.jbuilder index 72f0083c4..7418a8fd8 100644 --- a/app/views/watchers/index.json.jbuilder +++ b/app/views/watchers/index.json.jbuilder @@ -1,4 +1,4 @@ -json.total_count @watchers.size +json.total_count @scopes_size json.watchers do json.partial! 'watcher', collection: @watchers, as: :watcher end