From 8e6d575d4e86def22122b32bd994ee0d33eed9a5 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Wed, 4 Apr 2007 17:32:23 +0000 Subject: [PATCH] Modified logged_in_user_membership controller method so that it returns a role git-svn-id: http://redmine.rubyforge.org/svn/trunk@415 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/application.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/application.rb b/app/controllers/application.rb index dd8d71193..2a23c311e 100644 --- a/app/controllers/application.rb +++ b/app/controllers/application.rb @@ -32,8 +32,10 @@ class ApplicationController < ActionController::Base end end + # Returns the role that the logged in user has on the current project + # or nil if current user is not a member of the project def logged_in_user_membership - @user_membership ||= Member.find(:first, :conditions => ["user_id=? and project_id=?", self.logged_in_user.id, @project.id]) + @user_membership ||= logged_in_user.role_for_project(@project) end # check if login is globally required to access the application @@ -86,8 +88,7 @@ class ApplicationController < ActionController::Base # admin is always authorized return true if self.logged_in_user.admin? # if not admin, check membership permission - @user_membership ||= logged_in_user.role_for_project(@project) - if @user_membership and Permission.allowed_to_role( "%s/%s" % [ ctrl, action ], @user_membership ) + if logged_in_user_membership and Permission.allowed_to_role( "%s/%s" % [ ctrl, action ], logged_in_user_membership ) return true end render :nothing => true, :status => 403