From 027189ac3c488ea48f97e71b8c3b22fe8d52b170 Mon Sep 17 00:00:00 2001 From: Rafael Schouten Date: Thu, 16 Oct 2014 16:23:20 +1100 Subject: [PATCH] rename check methods --- app/controllers/admin/enterprises_controller.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/controllers/admin/enterprises_controller.rb b/app/controllers/admin/enterprises_controller.rb index 1beb854a47..7d38e408d6 100644 --- a/app/controllers/admin/enterprises_controller.rb +++ b/app/controllers/admin/enterprises_controller.rb @@ -3,11 +3,11 @@ module Admin before_filter :load_enterprise_set, :only => :index before_filter :load_countries, :except => :index before_filter :load_methods_and_fees, :only => [:new, :edit, :update, :create] - before_filter :check_sells, only: :update - before_filter :check_bulk_sells, only: :bulk_update + before_filter :check_can_change_sells, only: :update + before_filter :check_can_change_bulk_sells, only: :bulk_update before_filter :override_owner, only: :create - before_filter :check_owner, only: :update - before_filter :check_bulk_owner, only: :bulk_update + before_filter :check_can_change_owner, only: :update + before_filter :check_can_change_bulk_owner, only: :bulk_update helper 'spree/products' include OrderCyclesHelper @@ -64,7 +64,7 @@ module Admin @enterprise_fees = EnterpriseFee.managed_by(spree_current_user).for_enterprise(@enterprise).order(:fee_type, :name).all end - def check_bulk_sells + def check_can_change_bulk_sells unless spree_current_user.admin? params[:enterprise_set][:collection_attributes].each do |i, enterprise_params| enterprise_params.delete :sells @@ -72,7 +72,7 @@ module Admin end end - def check_sells + def check_can_change_sells params[:enterprise].delete :sells unless spree_current_user.admin? end @@ -80,13 +80,13 @@ module Admin params[:enterprise][:owner_id] = spree_current_user.id unless spree_current_user.admin? end - def check_owner + def check_can_change_owner unless ( spree_current_user == @enterprise.owner ) || spree_current_user.admin? params[:enterprise].delete :owner_id end end - def check_bulk_owner + def check_can_change_bulk_owner unless spree_current_user.admin? params[:enterprise_set][:collection_attributes].each do |i, enterprise_params| enterprise_params.delete :owner_id