瀏覽代碼

Optimize users visibility check (#39857).

Patch by Pavel Rosický.


git-svn-id: https://svn.redmine.org/redmine/trunk@22567 e93f8b46-1217-0410-a6f0-8f06a7374b81
pull/145/merge
Go MAEDA 5 月之前
父節點
當前提交
fa85583c96
共有 1 個檔案被更改,包括 2 行新增2 行删除
  1. 2
    2
      app/models/principal.rb

+ 2
- 2
app/models/principal.rb 查看文件

@@ -48,8 +48,8 @@ class Principal < ActiveRecord::Base
all
else
view_all_active = false
if user.memberships.to_a.any?
view_all_active = user.memberships.any? {|m| m.roles.any? {|r| r.users_visibility == 'all'}}
if user.memberships.any?
view_all_active = User.where(id: user.id).joins(memberships: :roles).where("#{Role.table_name}.users_visibility = ?", 'all').any?
else
view_all_active = user.builtin_role.users_visibility == 'all'
end

Loading…
取消
儲存