Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Use more boolean comparators where it makes sense

Browse source
This commit is contained in:
wvengen 2015-01-14 22:56:32 +01:00
parent 1063aea4af
commit 7e0aa66936
8 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/application_controller.rb
View file

@ -18,7 +18,7 @@ class ApplicationController < ActionController::Base
def current_user
# check if there is a valid session and return the logged-in user (its object)
if session[:user_id] and params[:foodcoop]
if session[:user_id] && params[:foodcoop]
# for shared-host installations. check if the cookie-subdomain fits to request.
@current_user ||= User.find_by_id(session[:user_id]) if session[:scope] == FoodsoftConfig.scope
end
@ -99,7 +99,7 @@ class ApplicationController < ActionController::Base
# if fails the user will redirected to startpage
def authenticate_membership_or_admin(group_id = params[:id])
@group = Group.find(group_id)
unless @group.member?(@current_user) or @current_user.role_admin?
unless @group.member?(@current_user) || @current_user.role_admin?
redirect_to root_path, alert: I18n.t('application.controller.error_members_only')
end
end