Merge remote-tracking branch 'openstreetmap/pull/1040'

[rails.git] / app / controllers / user_roles_controller.rb

diff --git a/app/controllers/user_roles_controller.rb b/app/controllers/user_roles_controller.rb
index 11a1dc41ee28f5c692f1055276f9482ad6785787..1cfbaf977b0d5a487f2bba28bd198dc2cfa88c9b 100644 (file)
--- a/app/controllers/user_roles_controller.rb
+++ b/app/controllers/user_roles_controller.rb
@@ -1,54 +1,44 @@
 class UserRolesController < ApplicationController
 class UserRolesController < ApplicationController

-  layout 'site'
+  layout "site"

 
 

-  before_filter :authorize_web
-  before_filter :require_user
-  before_filter :lookup_this_user
-  before_filter :require_administrator
-  before_filter :require_valid_role
-  before_filter :not_in_role, :only => [:grant]
-  before_filter :in_role, :only => [:revoke]
+  before_action :authorize_web
+  before_action :require_user
+  before_action :lookup_this_user
+  before_action :require_administrator
+  before_action :require_valid_role
+  before_action :not_in_role, :only => [:grant]
+  before_action :in_role, :only => [:revoke]

 
   def grant
 
   def grant

-    @this_user.roles.create({
-      :role => @role, :granter_id => @user.id
-    }, :without_protection => true)
-    redirect_to :controller => 'user', :action => 'view', :display_name => @this_user.display_name
+    @this_user.roles.create(:role => @role, :granter_id => @user.id)
+    redirect_to :controller => "user", :action => "view", :display_name => @this_user.display_name

   end
 
   def revoke
   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
+    UserRole.delete_all(:user_id => @this_user.id, :role => @role)
+    redirect_to :controller => "user", :action => "view", :display_name => @this_user.display_name

   end
 
   private
   end
 
   private

+

   ##
   # require that the user is an administrator, or fill out a helpful error message
   # and return them to theuser page.
   def require_administrator
     unless @user.administrator?
   ##
   # require that the user is an administrator, or fill out a helpful error message
   # 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
-    end
-  end
-
-  ##
-  # ensure that there is a "this_user" instance variable
-  def lookup_this_user
-    unless @this_user = User.find_by_display_name(params[:display_name])
-      @not_found_user = params[:display_name]
-      render :template => 'user/no_such_user', :status => :not_found
+      flash[:error] = t "user_role.filter.not_an_administrator"
+      redirect_to :controller => "user", :action => "view", :display_name => @this_user.display_name

     end
   end
 
   ##
     end
   end
 
   ##

-  # require that the given role is valid. the role is a URL 
+  # require that the given role is valid. the role is a URL

   # parameter, so should always be present.
   def require_valid_role
     @role = params[:role]
     unless UserRole::ALL_ROLES.include?(@role)
   # parameter, so should always be present.
   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
 
     end
   end
 


@@ -56,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
   # 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
 
     end
   end
 


@@ -65,8 +55,8 @@ class UserRolesController < ApplicationController
   # checks that the user already has this role
   def in_role
     unless @this_user.has_role? @role
   # 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
     end
   end
 end