floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

[FIX]add user organization count

This commit is contained in:
viletyy 2021-01-29 15:47:43 +08:00
parent 3d495797c0
commit c6269f44ee
3 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/users_controller.rb
View File

@ -31,6 +31,7 @@ class UsersController < ApplicationController
#用户的组织数量 #用户的组织数量
# @user_composes_count = @user.composes.size # @user_composes_count = @user.composes.size
@user_composes_count = 0 @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 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_common_count = user_projects.common.size
@projects_mirrior_count = user_projects.mirror.size @projects_mirrior_count = user_projects.mirror.size

1
app/models/owner.rb
View File

@ -61,7 +61,6 @@
class Owner < ApplicationRecord class Owner < ApplicationRecord
self.table_name = "users" self.table_name = "users"
include ProjectOperable
include ProjectAbility include ProjectAbility
has_many :projects, foreign_key: :user_id, dependent: :destroy has_many :projects, foreign_key: :user_id, dependent: :destroy

1
app/views/users/show.json.jbuilder
View File

@ -12,6 +12,7 @@ json.watched_count @user.fan_count #粉丝
json.watching_count @user.follow_count #关注数 json.watching_count @user.follow_count #关注数
json.undo_events @undo_events json.undo_events @undo_events
json.user_composes_count @user_composes_count json.user_composes_count @user_composes_count
json.user_org_count @user_org_count
json.common_projects_count @projects_common_count json.common_projects_count @projects_common_count
json.mirror_projects_count @projects_mirrior_count json.mirror_projects_count @projects_mirrior_count
json.sync_mirror_projects_count @projects_sync_mirrior_count json.sync_mirror_projects_count @projects_sync_mirrior_count