From cd3e258b5947bac578eeb14650c3dab7bfd37da5 Mon Sep 17 00:00:00 2001 From: Kristina Lim Date: Sat, 20 Oct 2018 22:43:28 +0800 Subject: [PATCH] Rename report authorizers to reflect permissions --- .../enterprise_fee_summary_report_controller.rb | 8 ++++---- .../enterprise_fee_summary_report/_filters.html.haml | 12 ++++++------ .../reports/{report_authorizer.rb => permissions.rb} | 2 +- .../{report_authorizer.rb => permissions.rb} | 4 ++-- ...report_authorizer_spec.rb => permissions_spec.rb} | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) rename lib/open_food_network/reports/{report_authorizer.rb => permissions.rb} (84%) rename lib/order_management/reports/enterprise_fee_summary/{report_authorizer.rb => permissions.rb} (92%) rename spec/lib/order_management/reports/enterprise_fee_summary/{report_authorizer_spec.rb => permissions_spec.rb} (98%) diff --git a/app/controllers/spree/admin/reports/enterprise_fee_summary_report_controller.rb b/app/controllers/spree/admin/reports/enterprise_fee_summary_report_controller.rb index ce749ce882..f0236c21a3 100644 --- a/app/controllers/spree/admin/reports/enterprise_fee_summary_report_controller.rb +++ b/app/controllers/spree/admin/reports/enterprise_fee_summary_report_controller.rb @@ -1,6 +1,6 @@ require "open_food_network/reports" require "order_management/reports/enterprise_fee_summary/parameters" -require "order_management/reports/enterprise_fee_summary/report_authorizer" +require "order_management/reports/enterprise_fee_summary/permissions" require "order_management/reports/enterprise_fee_summary/report_service" require "order_management/reports/enterprise_fee_summary/renderers/csv_renderer" require "order_management/reports/enterprise_fee_summary/renderers/html_renderer" @@ -10,7 +10,7 @@ module Spree module Reports class EnterpriseFeeSummaryReportController < BaseController before_filter :load_report_parameters, only: [:index] - before_filter :load_report_authorizer, only: [:index] + before_filter :load_permissions, only: [:index] def index return render_report_form if params[:report].blank? @@ -43,8 +43,8 @@ module Spree @report_parameters = report_klass::Parameters.new(params[:report] || {}) end - def load_report_authorizer - @report_authorizer = report_klass::ReportAuthorizer.new(spree_current_user) + def load_permissions + @permissions = report_klass::Permissions.new(spree_current_user) end def render_report diff --git a/app/views/spree/admin/reports/enterprise_fee_summary_report/_filters.html.haml b/app/views/spree/admin/reports/enterprise_fee_summary_report/_filters.html.haml index 25c9a2eed4..bb2135b2e9 100644 --- a/app/views/spree/admin/reports/enterprise_fee_summary_report/_filters.html.haml +++ b/app/views/spree/admin/reports/enterprise_fee_summary_report/_filters.html.haml @@ -16,31 +16,31 @@ .row .sixteen.columns.alpha = f.label :distributor_ids - = f.collection_select(:distributor_ids, @report_authorizer.allowed_distributors, :id, :name, {}, {class: "select2 fullwidth", multiple: true}) + = f.collection_select(:distributor_ids, @permissions.allowed_distributors, :id, :name, {}, {class: "select2 fullwidth", multiple: true}) .row .sixteen.columns.alpha = f.label :producer_ids - = f.collection_select(:producer_ids, @report_authorizer.allowed_producers, :id, :name, {}, {class: "select2 fullwidth", multiple: true}) + = f.collection_select(:producer_ids, @permissions.allowed_producers, :id, :name, {}, {class: "select2 fullwidth", multiple: true}) .row .sixteen.columns.alpha = f.label :order_cycle_ids - = f.collection_select(:order_cycle_ids, @report_authorizer.allowed_order_cycles, :id, :name, {}, {class: "select2 fullwidth", multiple: true}) + = f.collection_select(:order_cycle_ids, @permissions.allowed_order_cycles, :id, :name, {}, {class: "select2 fullwidth", multiple: true}) .row .eight.columns.alpha = f.label :enterprise_fee_ids - = f.collection_select(:enterprise_fee_ids, @report_authorizer.allowed_enterprise_fees, :id, :name, {}, {class: "select2 fullwidth", multiple: true}) + = f.collection_select(:enterprise_fee_ids, @permissions.allowed_enterprise_fees, :id, :name, {}, {class: "select2 fullwidth", multiple: true}) .eight.columns.omega = f.label :shipping_method_ids - = f.collection_select(:shipping_method_ids, @report_authorizer.allowed_shipping_methods, :id, :name, {}, {class: "select2 fullwidth", multiple: true}) + = f.collection_select(:shipping_method_ids, @permissions.allowed_shipping_methods, :id, :name, {}, {class: "select2 fullwidth", multiple: true}) .row .eight.columns.alpha   .eight.columns.omega = f.label :payment_method_ids - = f.collection_select(:payment_method_ids, @report_authorizer.allowed_payment_methods, :id, :name, {}, {class: "select2 fullwidth", multiple: true}) + = f.collection_select(:payment_method_ids, @permissions.allowed_payment_methods, :id, :name, {}, {class: "select2 fullwidth", multiple: true}) .row .sixteen.columns.alpha diff --git a/lib/open_food_network/reports/report_authorizer.rb b/lib/open_food_network/reports/permissions.rb similarity index 84% rename from lib/open_food_network/reports/report_authorizer.rb rename to lib/open_food_network/reports/permissions.rb index 88225a26f5..1e8a8e3978 100644 --- a/lib/open_food_network/reports/report_authorizer.rb +++ b/lib/open_food_network/reports/permissions.rb @@ -1,6 +1,6 @@ module OpenFoodNetwork module Reports - class ReportAuthorizer + class Permissions attr_accessor :user def initialize(user) diff --git a/lib/order_management/reports/enterprise_fee_summary/report_authorizer.rb b/lib/order_management/reports/enterprise_fee_summary/permissions.rb similarity index 92% rename from lib/order_management/reports/enterprise_fee_summary/report_authorizer.rb rename to lib/order_management/reports/enterprise_fee_summary/permissions.rb index f49e28c88d..8dea4c7f6d 100644 --- a/lib/order_management/reports/enterprise_fee_summary/report_authorizer.rb +++ b/lib/order_management/reports/enterprise_fee_summary/permissions.rb @@ -1,9 +1,9 @@ -require "open_food_network/reports/report_authorizer" +require "open_food_network/reports/permissions" module OrderManagement module Reports module EnterpriseFeeSummary - class ReportAuthorizer < OpenFoodNetwork::Reports::ReportAuthorizer + class Permissions < OpenFoodNetwork::Reports::Permissions def allowed_order_cycles @allowed_order_cycles ||= OrderCycle.accessible_by(user) end diff --git a/spec/lib/order_management/reports/enterprise_fee_summary/report_authorizer_spec.rb b/spec/lib/order_management/reports/enterprise_fee_summary/permissions_spec.rb similarity index 98% rename from spec/lib/order_management/reports/enterprise_fee_summary/report_authorizer_spec.rb rename to spec/lib/order_management/reports/enterprise_fee_summary/permissions_spec.rb index 33c02ce76e..3ec63e27ca 100644 --- a/spec/lib/order_management/reports/enterprise_fee_summary/report_authorizer_spec.rb +++ b/spec/lib/order_management/reports/enterprise_fee_summary/permissions_spec.rb @@ -1,8 +1,8 @@ require "spec_helper" -require "order_management/reports/enterprise_fee_summary/report_authorizer" +require "order_management/reports/enterprise_fee_summary/permissions" -describe OrderManagement::Reports::EnterpriseFeeSummary::ReportAuthorizer do +describe OrderManagement::Reports::EnterpriseFeeSummary::Permissions do let!(:order_cycle) { create(:simple_order_cycle) } let!(:incoming_exchange) { create(:exchange, incoming: true, order_cycle: order_cycle) } let!(:outgoing_exchange) { create(:exchange, incoming: false, order_cycle: order_cycle) }