From aea8ab4c7f52153a047b4de73ff9ed2da8fff58a Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Thu, 23 Oct 2014 16:32:43 +1100 Subject: [PATCH] Move #manages_one_enterprise? from User model to Permissions --- app/controllers/spree/admin/overview_controller_decorator.rb | 2 +- app/models/spree/user_decorator.rb | 4 ---- lib/open_food_network/permissions.rb | 4 ++++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/spree/admin/overview_controller_decorator.rb b/app/controllers/spree/admin/overview_controller_decorator.rb index 74535d5dd7..c73073c0fc 100644 --- a/app/controllers/spree/admin/overview_controller_decorator.rb +++ b/app/controllers/spree/admin/overview_controller_decorator.rb @@ -5,7 +5,7 @@ Spree::Admin::OverviewController.class_eval do @product_count = Spree::Product.active.managed_by(spree_current_user).count @order_cycle_count = OrderCycle.active.managed_by(spree_current_user).count - if spree_current_user.manages_one_enterprise? + if OpenFoodNetwork::Permissions.new(spree_current_user).manages_one_enterprise? @enterprise = @enterprises.first if @enterprise.sells == "unspecified" render "welcome", layout: "spree/layouts/bare_admin" diff --git a/app/models/spree/user_decorator.rb b/app/models/spree/user_decorator.rb index e8b75f6466..06a413b469 100644 --- a/app/models/spree/user_decorator.rb +++ b/app/models/spree/user_decorator.rb @@ -19,10 +19,6 @@ Spree.user_class.class_eval do end end - def manages_one_enterprise? - enterprises.length == 1 - end - def send_signup_confirmation Spree::UserMailer.signup_confirmation(self).deliver end diff --git a/lib/open_food_network/permissions.rb b/lib/open_food_network/permissions.rb index 3d5df1e804..60c2acbeaf 100644 --- a/lib/open_food_network/permissions.rb +++ b/lib/open_food_network/permissions.rb @@ -25,6 +25,10 @@ module OpenFoodNetwork managed_and_related_enterprises_with :manage_products end + def manages_one_enterprise? + @user.enterprises.length == 1 + end + private