Browse Source

[FIX]add user organization count

tags/v3.0.1
viletyy 5 years ago
parent
commit
c6269f44ee
3 changed files with 2 additions and 1 deletions
  1. +1
    -0
      app/controllers/users_controller.rb
  2. +0
    -1
      app/models/owner.rb
  3. +1
    -0
      app/views/users/show.json.jbuilder

+ 1
- 0
app/controllers/users_controller.rb View File

@@ -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


+ 0
- 1
app/models/owner.rb View File

@@ -61,7 +61,6 @@
class Owner < ApplicationRecord
self.table_name = "users"

include ProjectOperable
include ProjectAbility

has_many :projects, foreign_key: :user_id, dependent: :destroy


+ 1
- 0
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.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

Loading…
Cancel
Save