Split order_cycle_simple_view logic into index and form scopings

This commit is contained in:
Rob Harrington
2015-02-25 11:07:04 +11:00
parent 5563d23beb
commit 31054c7bf4
5 changed files with 13 additions and 9 deletions

View File

@@ -59,8 +59,12 @@ module OrderCyclesHelper
OrderCycle.active.with_distributor(@distributor).present?
end
def order_cycles_simple_view
@order_cycles_simple_view ||= !OpenFoodNetwork::Permissions.new(spree_current_user).can_manage_complex_order_cycles?
def order_cycles_simple_index
@order_cycles_simple_index ||= !OpenFoodNetwork::Permissions.new(spree_current_user).can_manage_complex_order_cycles?
end
def order_cycles_simple_form
@order_cycles_simple_form ||= @order_cycle.coordinator.sells == 'own'
end
def order_cycles_enabled?

View File

@@ -5,7 +5,7 @@
%td= order_cycle_form.text_field :orders_open_at, :class => 'datetimepicker', :value => order_cycle.orders_open_at
%td= order_cycle_form.text_field :orders_close_at, :class => 'datetimepicker', :value => order_cycle.orders_close_at
- unless order_cycles_simple_view
- unless order_cycles_simple_index
%td.suppliers
- order_cycle.suppliers.merge(OpenFoodNetwork::Permissions.new(spree_current_user).order_cycle_enterprises).each do |s|
= s.name

View File

@@ -1,9 +1,9 @@
%h1 Edit Order Cycle
- ng_controller = order_cycles_simple_view ? 'AdminSimpleEditOrderCycleCtrl' : 'AdminEditOrderCycleCtrl'
- ng_controller = order_cycles_simple_form ? 'AdminSimpleEditOrderCycleCtrl' : 'AdminEditOrderCycleCtrl'
= form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.order_cycles', 'ng-controller' => ng_controller, 'ng-submit' => 'submit($event)'} do |f|
- if order_cycles_simple_view
- if order_cycles_simple_form
= render 'simple_form', f: f
- else
= render 'form', f: f

View File

@@ -11,7 +11,7 @@
%col
%col{'style' => 'width: 20%;'}
%col{'style' => 'width: 20%;'}
- unless order_cycles_simple_view
- unless order_cycles_simple_index
%col
%col
%col
@@ -24,7 +24,7 @@
%th Name
%th Open
%th Close
- unless order_cycles_simple_view
- unless order_cycles_simple_index
%th Suppliers
%th Coordinator
%th Distributors

View File

@@ -1,10 +1,10 @@
%h1 New Order Cycle
- ng_controller = order_cycles_simple_view ? 'AdminSimpleCreateOrderCycleCtrl' : 'AdminCreateOrderCycleCtrl'
- ng_controller = order_cycles_simple_form ? 'AdminSimpleCreateOrderCycleCtrl' : 'AdminCreateOrderCycleCtrl'
= admin_inject_order_cycle_instance
= form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.order_cycles', 'ng-controller' => ng_controller, 'ng-submit' => 'submit($event)'} do |f|
- if order_cycles_simple_view
- if order_cycles_simple_form
= render 'simple_form', f: f
- else
= render 'form', f: f