X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1e3b3c1f10213c48a40083e8bbca1429d9f819d6..5944feb008005f67a09240d4b9ad1e2513f7633b:/app/controllers/user_roles_controller.rb?ds=sidebyside

diff --git a/app/controllers/user_roles_controller.rb b/app/controllers/user_roles_controller.rb
index 51106866e..469b2c40b 100644
--- a/app/controllers/user_roles_controller.rb
+++ b/app/controllers/user_roles_controller.rb
@@ -1,83 +1,60 @@
 class UserRolesController < ApplicationController
-  layout 'site'
+  include UserMethods
 
-  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]
-  around_filter :setup_nonce
+  layout "site"
 
-  def grant
-    @this_user.roles.create(:role => @role, :granter_id => @user.id)
-    redirect_to :controller => 'user', :action => 'view', :display_name => @this_user.display_name
-  end
+  before_action :authorize_web
 
-  def revoke
-    UserRole.delete_all({:user_id => @this_user.id, :role => @role})
-    redirect_to :controller => 'user', :action => 'view', :display_name => @this_user.display_name
-  end
+  authorize_resource
 
-  private
-  def require_administrator
-    unless @user.administrator?
-      flash[:notice] = t'user_role.filter.not_an_administrator'
-      redirect_to :controller => 'user', :action => 'view', :display_name => @this_user.display_name
-    end
-  end
+  before_action :lookup_user
+  before_action :require_valid_role
+  before_action :not_in_role, :only => [:grant]
+  before_action :in_role, :only => [:revoke]
 
-  ##
-  # ensure that there is a "this_user" instance variable
-  def lookup_this_user
-    @this_user = User.find_by_display_name(params[:display_name])
-  rescue ActiveRecord::RecordNotFound
-    redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name] unless @this_user
+  def grant
+    @user.roles.create(:role => @role, :granter => current_user)
+    redirect_to user_path(@user)
   end
 
-  ##
-  # the random nonce here which isn't predictable, making an CSRF 
-  # procedure much, much more difficult. setup the nonce. if the given
-  # nonce matches the session nonce then yield into the actual method.
-  # otherwise, just sets up the nonce for the form.
-  def setup_nonce
-    if params[:nonce] and params[:nonce] == session[:nonce]
-      @nonce = params[:nonce]
-      yield
+  def revoke
+    # checks that administrator role is not revoked from current user
+    if current_user == @user && @role == "administrator"
+      flash[:error] = t("user_role.filter.not_revoke_admin_current_user")
     else
-      @nonce = OAuth::Helper.generate_nonce
-      session[:nonce] = @nonce
-      render
+      UserRole.where(:user => @user, :role => @role).delete_all
     end
-  end    
+    redirect_to user_path(@user)
+  end
+
+  private
 
   ##
-  # 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)
-      flash[:notice] = 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 user_path(@user)
     end
   end
 
   ##
   # checks that the user doesn't already have this role
   def not_in_role
-    if @this_user.has_role? @role
-      flash[:notice] = t('user_role.filter.already_has_role', :role => @role)
-      redirect_to :controller => 'user', :action => 'view', :display_name => @this_user.display_name
+    if @user.role? @role
+      flash[:error] = t("user_role.filter.already_has_role", :role => @role)
+      redirect_to user_path(@user)
     end
   end
 
   ##
-  # checks that the user doesn't already have this role
+  # checks that the user already has this role
   def in_role
-    unless @this_user.has_role? @role
-      flash[:notice] = t('user_role.filter.doesnt_have_role', :role => @role)
-      redirect_to :controller => 'user', :action => 'view', :display_name => @this_user.display_name
+    unless @user.role? @role
+      flash[:error] = t("user_role.filter.doesnt_have_role", :role => @role)
+      redirect_to user_path(@user)
     end
   end
 end