Merge branch 'design_team' into ldap

This commit is contained in:
Christophe Vilayphiou committed 2012-05-14 12:42:06 +08:00
commit 59b55d1574
15 files changed
+95 -11

No files matched your search

+5
View File
@@ -19,6 +19,10 @@ module OrbitCoreLib
end
def app_auth
ModuleApp.first(conditions: {:title => self.class::APP_NAME} )
end
def pp_object
"Object Auth method 'pp_object' need to be defined for class #{self.class}"
end
@@ -67,6 +71,7 @@ module OrbitCoreLib
module PermissionUnility
private
def check_permission(type = :use)
setup_vars
permission_grant = current_user.admin?? true : false
module_app = @module_app.nil?? find_module_app_by_token(params[:token]) : @module_app
unless permission_grant