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

Fixes user display.

This commit is contained in:
Saurabh Bhatia 2014-05-05 14:20:58 +08:00
parent 9822699854
commit 1aec0eff4c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,9 +55,10 @@ class Admin::AuthorizationsController < OrbitAdminController
roles = Role.all roles = Role.all
if @type if @type
@object_id = @object.id if @object @object_id = @object.id if @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?}.map {|u| u.user}
users[role] = users_for_role - @module_app.module_managers users[role] = users_for_role - @sub_mangers
users users
end end
else else

4
app/models/authorization.rb
View File

@ -30,7 +30,7 @@ class Authorization
def self.create_module_authorization(module_app_id,user_id) def self.create_module_authorization(module_app_id,user_id)
user = User.find(user_id) user = User.find(user_id)
workgroup = Workgroup.find_by(key: "managers") workgroup = Workgroup.find(key: "managers")
module_app = ModuleApp.find(module_app_id) module_app = ModuleApp.find(module_app_id)
if (user.is_admin? || user.is_manager?(module_app) || user.is_sub_manager?(module_app)|| user.is_manager_with_role?(module_app)) if (user.is_admin? || user.is_manager?(module_app) || user.is_sub_manager?(module_app)|| user.is_manager_with_role?(module_app))
puts "User Already Authorized" puts "User Already Authorized"
@ -43,7 +43,7 @@ class Authorization
def self.create_category_authorization(module_app_id, category_id, user_id) def self.create_category_authorization(module_app_id, category_id, user_id)
user = User.find(user_id) user = User.find(user_id)
workgroup = Workgroup.find_by(key: "sub_managers") workgroup = Workgroup.find_by(key: "sub_managers")
module_app = ModuleApp.find_by(module_app_id) module_app = ModuleApp.find(module_app_id)
if (user.is_admin? || user.is_manager?(module_app) || user.is_sub_manager?(module_app) || user.is_manager_with_role?(module_app)) if (user.is_admin? || user.is_manager?(module_app) || user.is_sub_manager?(module_app) || user.is_manager_with_role?(module_app))
puts "User Already Authorized" puts "User Already Authorized"
else else