developers/orbit-basic
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

User role and sub_role simple interface complete

Browse Source
This commit is contained in:
Matthew Fu authored and Christophe Vilayphiou committed 2012-01-24 12:28:33 +08:00
1 parent 25cbe0c2a5
commit afbb9e266a
4 files changed
+88 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/controllers/admin/module_apps_controller.rb
+2 -3
View File
@@ -18,7 +18,6 @@ class Admin::ModuleAppsController < ApplicationController
def edit
@module_app = ModuleApp.find(params[:id])
end
@@ -91,7 +90,7 @@ class Admin::ModuleAppsController < ApplicationController
private
def user_has_manager_privilege?
@module_app = ModuleApp.find(params[:id])
@assign_to_user = User.find params[:manager_id] rescue nil
@assign_to_user = User.find params[:manager][:id] rescue nil
if current_user.admin? #only admin can assign app's manager
return
end
@@ -103,7 +102,7 @@ class Admin::ModuleAppsController < ApplicationController
def user_has_sub_manager_privilege?
@module_app = ModuleApp.find(params[:id])
@assign_to_user = User.find params[:sub_manager_id] rescue nil
@assign_to_user = User.find params[:sub_manager][:id] rescue nil
if current_user.admin? || @module_app.managing_users.include?(current_user) #admin or app's manager can assign app's subanager
return
end