alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for nil user in authorization

This commit is contained in:
Saurabh Bhatia 2014-07-17 11:50:41 +08:00
parent a1ab533b43
commit 62260147b1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/admin/authorizations_controller.rb
View File

@ -57,13 +57,13 @@ class Admin::AuthorizationsController < OrbitAdminController
@object_id = @object.id if @object @object_id = @object.id if @object
@sub_mangers = Authorization.category_sub_managers(@object) @sub_mangers = Authorization.category_sub_managers(@object)
@sorted_users = roles.inject({}) do |users, role| @sorted_users = roles.inject({}) do |users, role|
users_for_role = role.member_profiles.select {|m| !m.user.is_admin?}.map {|u| u.user} users_for_role = role.member_profiles.select {|m| !m.user.is_admin? if m.user}.map {|u| u.user}
users[role] = users_for_role - @sub_mangers users[role] = users_for_role - @sub_mangers
users users
end end
else else
@sorted_users = roles.inject({}) do |users, role| @sorted_users = roles.inject({}) do |users, role|
users_for_role = role.member_profiles.select {|m| !m.user.is_admin?}.map {|u| u.user} users_for_role = role.member_profiles.select {|m| !m.user.is_admin? if m.user}.map {|u| u.user}
users[role] = users_for_role - @module_app.module_managers users[role] = users_for_role - @module_app.module_managers
users users
end end