diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index d5ca638a6..6c5c10fb3 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -31,6 +31,7 @@ class UsersController < ApplicationController #用户的组织数量 # @user_composes_count = @user.composes.size @user_composes_count = 0 + @user_org_count = User.current.logged? ? @user.organizations.with_visibility(%w(common limited)).size + @user.organizations.with_visibility("privacy").joins(:organization_users).where(organization_users: {user_id: current_user.id}).size : @user.organizations.with_visibility("common").size user_projects = User.current.logged? && (User.current.admin? || User.current.login == @user.login) ? @user.projects : @user.projects.visible @projects_common_count = user_projects.common.size @projects_mirrior_count = user_projects.mirror.size diff --git a/app/models/owner.rb b/app/models/owner.rb index e058ab564..d4194c32c 100644 --- a/app/models/owner.rb +++ b/app/models/owner.rb @@ -61,7 +61,6 @@ class Owner < ApplicationRecord self.table_name = "users" - include ProjectOperable include ProjectAbility has_many :projects, foreign_key: :user_id, dependent: :destroy diff --git a/app/views/users/show.json.jbuilder b/app/views/users/show.json.jbuilder index 9b4956197..54f85c5c2 100644 --- a/app/views/users/show.json.jbuilder +++ b/app/views/users/show.json.jbuilder @@ -12,6 +12,7 @@ json.watched_count @user.fan_count #粉丝 json.watching_count @user.follow_count #关注数 json.undo_events @undo_events json.user_composes_count @user_composes_count +json.user_org_count @user_org_count json.common_projects_count @projects_common_count json.mirror_projects_count @projects_mirrior_count json.sync_mirror_projects_count @projects_sync_mirrior_count \ No newline at end of file