From 0933df82a4012138d05fcd82c5ac45337d6ca805 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Wed, 6 May 2015 10:52:30 +0200 Subject: [PATCH] Streamline of access checks. --- lib/sessions/backend/collections/base.rb | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/lib/sessions/backend/collections/base.rb b/lib/sessions/backend/collections/base.rb index 9743e26b5..98a0c294e 100644 --- a/lib/sessions/backend/collections/base.rb +++ b/lib/sessions/backend/collections/base.rb @@ -23,25 +23,22 @@ class Sessions::Backend::Collections::Base # check role based access if self.class.is_role - access = nil + access = false self.class.is_role.each {|role| - if @user.is_role(role) - access = true - end + next if !@user.is_role(role) + access = true + break } return if !access end if self.class.is_not_role - - is_role = false + access = false self.class.is_not_role.each {|role| - - next if !@user.is_role(role) - - is_role = true + next if @user.is_role(role) + access = true break } - return if is_role + return if !access end # check timeout