From 1aec0eff4c528bc74f9e828e672d4c68f022c3c1 Mon Sep 17 00:00:00 2001 From: Saurabh Bhatia Date: Mon, 5 May 2014 14:20:58 +0800 Subject: [PATCH] Fixes user display. --- app/controllers/admin/authorizations_controller.rb | 3 ++- app/models/authorization.rb | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/admin/authorizations_controller.rb b/app/controllers/admin/authorizations_controller.rb index d1f3361..8d2438d 100644 --- a/app/controllers/admin/authorizations_controller.rb +++ b/app/controllers/admin/authorizations_controller.rb @@ -55,9 +55,10 @@ class Admin::AuthorizationsController < OrbitAdminController roles = Role.all if @type @object_id = @object.id if @object + @sub_mangers = Authorization.category_sub_managers(@object) @sorted_users = roles.inject({}) do |users, role| 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 end else diff --git a/app/models/authorization.rb b/app/models/authorization.rb index dad2a11..4199149 100644 --- a/app/models/authorization.rb +++ b/app/models/authorization.rb @@ -30,7 +30,7 @@ class Authorization def self.create_module_authorization(module_app_id,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) 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" @@ -43,7 +43,7 @@ class Authorization def self.create_category_authorization(module_app_id, category_id, user_id) user = User.find(user_id) 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)) puts "User Already Authorized" else