raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-17 00:07:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Rails/HelperInstanceVariable in injection_helper.rb

Browse Source
This commit is contained in:
Neal Chambers
2023-08-31 09:29:43 +09:00
parent 67d5ffdc54
commit 4feb8f922e
18 changed files with 78 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.rubocop_todo.yml
View File

@@ -451,7 +451,6 @@ Rails/HasManyOrHasOneDependent:
# Include: app/helpers/**/*.rb
Rails/HelperInstanceVariable:
Exclude:
- 'app/helpers/admin/injection_helper.rb'
- 'app/helpers/application_helper.rb'
- 'app/helpers/injection_helper.rb'
- 'app/helpers/order_cycles_helper.rb'

90
app/helpers/admin/injection_helper.rb
View File

@@ -2,71 +2,71 @@
module Admin
module InjectionHelper
def admin_inject_enterprise
def admin_inject_enterprise(enterprise)
admin_inject_json_ams "admin.enterprises",
"enterprise",
@enterprise,
enterprise,
Api::Admin::EnterpriseSerializer
end
def admin_inject_enterprises
def admin_inject_enterprises(my_enterprises, all_enterprises)
admin_inject_json_ams_array("ofn.admin",
"my_enterprises",
@my_enterprises,
my_enterprises,
Api::Admin::BasicEnterpriseSerializer) +
admin_inject_json_ams_array("ofn.admin",
"all_enterprises",
@all_enterprises,
all_enterprises,
Api::Admin::BasicEnterpriseSerializer)
end
def admin_inject_enterprise_relationships
def admin_inject_enterprise_relationships(enterprise_relationships)
admin_inject_json_ams_array "ofn.admin",
"enterprise_relationships",
@enterprise_relationships,
enterprise_relationships,
Api::Admin::EnterpriseRelationshipSerializer
end
def admin_inject_enterprise_roles
def admin_inject_enterprise_roles(enterprise_roles)
admin_inject_json_ams_array "ofn.admin",
"enterpriseRoles",
@enterprise_roles,
enterprise_roles,
Api::Admin::EnterpriseRoleSerializer
end
def admin_inject_payment_methods
def admin_inject_payment_methods(payment_methods)
admin_inject_json_ams_array "admin.paymentMethods",
"paymentMethods",
@payment_methods,
payment_methods,
Api::Admin::IdNameSerializer
end
def admin_inject_payment_method
def admin_inject_payment_method(payment_method)
admin_inject_json_ams "admin.paymentMethods",
"paymentMethod",
@payment_method,
payment_method,
Api::Admin::PaymentMethodSerializer
end
def admin_inject_shipping_methods
def admin_inject_shipping_methods(shipping_methods)
admin_inject_json_ams_array "admin.shippingMethods",
"shippingMethods",
@shipping_methods,
shipping_methods,
Api::Admin::IdNameSerializer
end
def admin_inject_shipping_method
def admin_inject_shipping_method(shipping_method)
admin_inject_json_ams "admin.shippingMethods",
"shippingMethod",
@shipping_method,
shipping_method,
Api::Admin::ShippingMethodSerializer
end
def admin_inject_shops(opts = {})
def admin_inject_shops(shops, opts = {})
opts.reverse_merge!(module: 'admin.customers')
admin_inject_json_ams_array opts[:module],
"shops",
@shops,
shops,
Api::Admin::IdNameSerializer
end
@@ -78,26 +78,26 @@ module Admin
Api::CountrySerializer
end
def admin_inject_hubs(opts = {})
def admin_inject_hubs(hubs, opts = {})
opts.reverse_merge!(module: 'ofn.admin')
admin_inject_json_ams_array opts[:module],
"hubs",
@hubs,
hubs,
Api::Admin::IdNameSerializer
end
def admin_inject_producers(opts = {})
def admin_inject_producers(producers, opts = {})
opts.reverse_merge!(module: 'ofn.admin')
admin_inject_json_ams_array opts[:module],
"producers",
@producers,
producers,
Api::Admin::IdNameSerializer
end
def admin_inject_inventory_items(opts = { module: 'ofn.admin' })
def admin_inject_inventory_items(inventory_items, opts = { module: 'ofn.admin' })
admin_inject_json_ams_array opts[:module],
"inventoryItems",
@inventory_items,
inventory_items,
Api::Admin::InventoryItemSerializer
end
@@ -117,69 +117,69 @@ module Admin
Api::CurrencyConfigSerializer
end
def admin_inject_enterprise_permissions
def admin_inject_enterprise_permissions(enterprise)
permissions =
{ can_manage_shipping_methods: can?(:manage_shipping_methods, @enterprise),
can_manage_payment_methods: can?(:manage_payment_methods, @enterprise),
can_manage_enterprise_fees: can?(:manage_enterprise_fees, @enterprise) }
{ can_manage_shipping_methods: can?(:manage_shipping_methods, enterprise),
can_manage_payment_methods: can?(:manage_payment_methods, enterprise),
can_manage_enterprise_fees: can?(:manage_enterprise_fees, enterprise) }
admin_inject_json "admin.enterprises", "enterprisePermissions", permissions
end
def admin_inject_hub_permissions
def admin_inject_hub_permissions(hub_permissions)
render partial: "admin/json/injection_ams", locals: { ngModule: "admin.variantOverrides",
name: "hubPermissions",
json: @hub_permissions.to_json }
json: hub_permissions.to_json }
end
def admin_inject_tax_categories(opts = { module: 'ofn.admin' })
def admin_inject_tax_categories(tax_categories, opts = { module: 'ofn.admin' })
admin_inject_json_ams_array opts[:module],
"tax_categories",
@tax_categories,
tax_categories,
Api::Admin::TaxCategorySerializer
end
def admin_inject_taxons
def admin_inject_taxons(taxons)
admin_inject_json_ams_array "admin.taxons",
"taxons",
@taxons,
taxons,
Api::Admin::TaxonSerializer
end
def admin_inject_users
def admin_inject_users(users)
admin_inject_json_ams_array "ofn.admin",
"users",
@users,
users,
Api::Admin::UserSerializer
end
def admin_inject_variant_overrides
def admin_inject_variant_overrides(variant_overrides)
admin_inject_json_ams_array "admin.variantOverrides",
"variantOverrides",
@variant_overrides,
variant_overrides,
Api::Admin::VariantOverrideSerializer
end
def admin_inject_order_cycle_instance
def admin_inject_order_cycle_instance(order_cycle)
render partial: "admin/json/injection_ams",
locals: { ngModule: 'admin.orderCycles',
name: 'ocInstance',
json: "{coordinator_id: '#{@order_cycle.coordinator.id}'}" }
json: "{coordinator_id: '#{order_cycle.coordinator.id}'}" }
end
def admin_inject_order_cycles
def admin_inject_order_cycles(order_cycles)
admin_inject_json_ams_array "admin.orders",
"orderCycles",
@order_cycles,
order_cycles,
Api::Admin::BasicOrderCycleSerializer,
current_user: spree_current_user
end
def admin_inject_spree_api_key
def admin_inject_spree_api_key(spree_api_key)
render partial: "admin/json/injection_ams",
locals: { ngModule: 'admin.indexUtils',
name: 'SpreeApiKey',
json: "'#{@spree_api_key}'" }
json: "'#{spree_api_key}'" }
end
def admin_inject_available_units

2
app/views/admin/customers/index.html.haml
View File

@@ -11,7 +11,7 @@
= t('admin.customers.index.new_customer')
= admin_inject_column_preferences(module: 'admin.customers')
= admin_inject_shops(module: 'admin.customers')
= admin_inject_shops(@shops, module: 'admin.customers')
= admin_inject_available_countries(module: 'admin.customers')
%div{ ng: { controller: 'customersCtrl' } }

2
app/views/admin/enterprise_fees/_data.html.haml
View File

@@ -1,3 +1,3 @@
= admin_inject_json_ams_array "admin.enterpriseFees", "enterprises", @enterprises, Api::Admin::IdNameSerializer
= admin_inject_tax_categories(module: "admin.enterpriseFees")
= admin_inject_tax_categories(@tax_categories, module: "admin.enterpriseFees")
= admin_inject_json_ams_array "admin.enterpriseFees", "calculators", @calculators, Api::Admin::CalculatorSerializer

4
app/views/admin/enterprise_relationships/_data.html.haml
View File

@@ -1,2 +1,2 @@
= admin_inject_enterprise_relationships
= admin_inject_enterprises
= admin_inject_enterprise_relationships(@enterprise_relationships)
= admin_inject_enterprises(@my_enterprises, @all_enterprises)

6
app/views/admin/enterprise_roles/_data.html.haml
View File

@@ -1,4 +1,4 @@
= admin_inject_enterprise_roles
= admin_inject_users
= admin_inject_enterprises
= admin_inject_enterprise_roles(@enterprise_roles)
= admin_inject_users(@users)
= admin_inject_enterprises(@my_enterprises, @all_enterprises)

2
app/views/admin/enterprises/_change_type_form.html.haml
View File

@@ -1,4 +1,4 @@
= admin_inject_enterprise
= admin_inject_enterprise(@enterprise)
= form_for @enterprise, url: main_app.register_admin_enterprise_path(@enterprise),
html: { name: "change_type", id: "change_type", novalidate: true, "ng-app" => "admin.enterprises", "ng-controller"=> 'changeTypeFormCtrl' } do |change_type_form|

10
app/views/admin/enterprises/_form_data.html.haml
View File

@@ -1,6 +1,6 @@
= admin_inject_enterprise
= admin_inject_taxons
= admin_inject_payment_methods
= admin_inject_shipping_methods
= admin_inject_enterprise_permissions
= admin_inject_enterprise(@enterprise)
= admin_inject_taxons(@taxons)
= admin_inject_payment_methods(@payment_methods)
= admin_inject_shipping_methods(@shipping_methods)
= admin_inject_enterprise_permissions(@enterprise)
= admin_inject_available_countries(module: 'admin.enterprises')

2
app/views/admin/order_cycles/edit.html.haml
View File

@@ -15,7 +15,7 @@
= t :edit_order_cycle
- ng_controller = @order_cycle.simple? ? 'AdminSimpleEditOrderCycleCtrl' : 'AdminEditOrderCycleCtrl'
= admin_inject_order_cycle_instance
= admin_inject_order_cycle_instance(@order_cycle)
= form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.orderCycles', 'ng-controller' => ng_controller, name: 'order_cycle_form'} do |f|
%save-bar{ dirty: "order_cycle_form.$dirty", persist: "true" }

2
app/views/admin/order_cycles/incoming.html.haml
View File

@@ -3,7 +3,7 @@
- content_for :page_title do
= t :edit_order_cycle
= admin_inject_order_cycle_instance
= admin_inject_order_cycle_instance(@order_cycle)
= form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.orderCycles', 'ng-controller' => 'AdminOrderCycleIncomingCtrl', name: 'order_cycle_form'} do |f|
= render 'wizard_progress'

2
app/views/admin/order_cycles/new.html.haml
View File

@@ -2,7 +2,7 @@
=t('new_order_cycle')
- ng_controller = @order_cycle.simple? ? 'AdminSimpleCreateOrderCycleCtrl' : 'AdminCreateOrderCycleCtrl'
= admin_inject_order_cycle_instance
= admin_inject_order_cycle_instance(@order_cycle)
= form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.orderCycles', 'ng-controller' => ng_controller, name: 'order_cycle_form'} do |f|

2
app/views/admin/order_cycles/outgoing.html.haml
View File

@@ -3,7 +3,7 @@
- content_for :page_title do
= t :edit_order_cycle
= admin_inject_order_cycle_instance
= admin_inject_order_cycle_instance(@order_cycle)
= form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.orderCycles', 'ng-controller' => 'AdminOrderCycleOutgoingCtrl', name: 'order_cycle_form'} do |f|
= render 'wizard_progress'

12
app/views/admin/variant_overrides/_data.html.haml
View File

@@ -1,7 +1,7 @@
= admin_inject_spree_api_key
= admin_inject_hubs(module: 'admin.variantOverrides')
= admin_inject_hub_permissions
= admin_inject_producers(module: 'admin.variantOverrides')
= admin_inject_spree_api_key(@spree_api_key)
= admin_inject_hubs(@hubs, module: 'admin.variantOverrides')
= admin_inject_hub_permissions(@hub_permissions)
= admin_inject_producers(@producers, module: 'admin.variantOverrides')
= admin_inject_column_preferences(module: 'admin.variantOverrides')
= admin_inject_variant_overrides
= admin_inject_inventory_items(module: 'admin.variantOverrides')
= admin_inject_variant_overrides(@variant_overrides)
= admin_inject_inventory_items(@inventory_items, module: 'admin.variantOverrides')

4
app/views/spree/admin/orders/edit.html.haml
View File

@@ -18,8 +18,8 @@
%div
= render partial: "spree/shared/error_messages", locals: { target: @order }
= admin_inject_shops(module: 'admin.orders')
= admin_inject_order_cycles
= admin_inject_shops(@shops, module: 'admin.orders')
= admin_inject_order_cycles(@order_cycles)
%div{"ng-controller" => "orderCtrl", "ofn-distributor-id" => @order.distributor_id, "ofn-order-cycle-id" => @order.order_cycle_id}
= render :partial => 'add_product' if can?(:update, @order)

4
app/views/spree/admin/orders/new.html.haml
View File

@@ -4,8 +4,8 @@
- content_for :page_actions do
%li= button_link_to t(:back_to_orders_list), spree.admin_orders_path, :icon => 'icon-arrow-left'
= admin_inject_shops(module: 'admin.orders')
= admin_inject_order_cycles
= admin_inject_shops(@shops, module: 'admin.orders')
= admin_inject_order_cycles(@order_cycles)
= render 'spree/admin/shared/order_tabs', current: 'Order Details'

2
app/views/spree/admin/payment_methods/_form.html.haml
View File

@@ -1,4 +1,4 @@
= admin_inject_payment_method
= admin_inject_payment_method(@payment_method)
= admin_inject_json_ams_array "admin.paymentMethods", "shops", @hubs, Api::Admin::BasicEnterpriseSerializer
.alpha.eleven.columns{ "ng-app" => "admin.paymentMethods", "ng-controller" => "paymentMethodCtrl" }
.row

8
app/views/spree/admin/products/index/_data.html.haml
View File

@@ -1,5 +1,5 @@
= admin_inject_producers
= admin_inject_taxons
= admin_inject_tax_categories
= admin_inject_spree_api_key
= admin_inject_producers(@producers)
= admin_inject_taxons(@taxons)
= admin_inject_tax_categories(@tax_categories)
= admin_inject_spree_api_key(@spree_api_key)
= admin_inject_column_preferences

2
app/views/spree/admin/shipping_methods/_form.html.haml
View File

@@ -1,4 +1,4 @@
= admin_inject_shipping_method
= admin_inject_shipping_method(@shipping_method)
.alpha.eleven.columns{ "ng-app" => "admin.shippingMethods",
"ng-controller" => "shippingMethodCtrl" }
.row