X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ef7f3d800cbdd49b692df10d312e5fd880e2e938..dc2a2c8ebd1a11e4a64555fda22c6859a51defff:/app/controllers/user_roles_controller.rb diff --git a/app/controllers/user_roles_controller.rb b/app/controllers/user_roles_controller.rb index 4316c5e94..8b1c2e8c0 100644 --- a/app/controllers/user_roles_controller.rb +++ b/app/controllers/user_roles_controller.rb @@ -1,5 +1,5 @@ class UserRolesController < ApplicationController - layout 'site' + layout "site" before_filter :authorize_web before_filter :require_user @@ -11,12 +11,12 @@ class UserRolesController < ApplicationController def grant @this_user.roles.create(:role => @role, :granter_id => @user.id) - redirect_to :controller => 'user', :action => 'view', :display_name => @this_user.display_name + redirect_to :controller => "user", :action => "view", :display_name => @this_user.display_name end def revoke UserRole.delete_all(:user_id => @this_user.id, :role => @role) - redirect_to :controller => 'user', :action => 'view', :display_name => @this_user.display_name + redirect_to :controller => "user", :action => "view", :display_name => @this_user.display_name end private @@ -26,8 +26,8 @@ class UserRolesController < ApplicationController # and return them to theuser page. def require_administrator unless @user.administrator? - flash[:error] = t 'user_role.filter.not_an_administrator' - redirect_to :controller => 'user', :action => 'view', :display_name => @this_user.display_name + flash[:error] = t "user_role.filter.not_an_administrator" + redirect_to :controller => "user", :action => "view", :display_name => @this_user.display_name end end @@ -37,8 +37,8 @@ class UserRolesController < ApplicationController def require_valid_role @role = params[:role] unless UserRole::ALL_ROLES.include?(@role) - flash[:error] = t('user_role.filter.not_a_role', :role => @role) - redirect_to :controller => 'user', :action => 'view', :display_name => @this_user.display_name + flash[:error] = t("user_role.filter.not_a_role", :role => @role) + redirect_to :controller => "user", :action => "view", :display_name => @this_user.display_name end end @@ -46,8 +46,8 @@ class UserRolesController < ApplicationController # checks that the user doesn't already have this role def not_in_role if @this_user.has_role? @role - flash[:error] = t('user_role.filter.already_has_role', :role => @role) - redirect_to :controller => 'user', :action => 'view', :display_name => @this_user.display_name + flash[:error] = t("user_role.filter.already_has_role", :role => @role) + redirect_to :controller => "user", :action => "view", :display_name => @this_user.display_name end end @@ -55,8 +55,8 @@ class UserRolesController < ApplicationController # checks that the user already has this role def in_role unless @this_user.has_role? @role - flash[:error] = t('user_role.filter.doesnt_have_role', :role => @role) - redirect_to :controller => 'user', :action => 'view', :display_name => @this_user.display_name + flash[:error] = t("user_role.filter.doesnt_have_role", :role => @role) + redirect_to :controller => "user", :action => "view", :display_name => @this_user.display_name end end end