raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-28 01:53:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use only AdminOrderCycleIncomingCtrl in incoming view and make AdminOrderCycleIncomingCtrl extend AdminEditOrderCycleCtrl

Browse Source 
Same for AdminOrderCycleOutgoingCtrl
This commit is contained in:
luisramos0
2019-11-02 16:07:29 +00:00
parent e03e3ae50a
commit 7845b6c6fb
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/admin/order_cycles/controllers/incoming_controller.js.coffee
View File

@@ -1,2 +1,3 @@
angular.module('admin.orderCycles').controller 'AdminOrderCycleIncomingCtrl', ($scope) ->
angular.module('admin.orderCycles').controller 'AdminOrderCycleIncomingCtrl', ($scope, $controller) ->
$controller('AdminEditOrderCycleCtrl', {$scope: $scope})
$scope.view = 'incoming'

3
app/assets/javascripts/admin/order_cycles/controllers/outgoing_controller.js.coffee
View File

@@ -1,2 +1,3 @@
angular.module('admin.orderCycles').controller 'AdminOrderCycleOutgoingCtrl', ($scope) ->
angular.module('admin.orderCycles').controller 'AdminOrderCycleOutgoingCtrl', ($scope, $controller) ->
$controller('AdminEditOrderCycleCtrl', {$scope: $scope})
$scope.view = 'outgoing'

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

@@ -2,10 +2,9 @@
= t :edit_order_cycle
= admin_inject_order_cycle_instance
= form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.orderCycles', 'ng-controller' => 'AdminEditOrderCycleCtrl', name: 'order_cycle_form'} do |f|
= 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|
%div{ 'ng-controller' => 'AdminOrderCycleIncomingCtrl' }
= render 'wizard_progress'
= render 'wizard_progress'
%save-bar{ dirty: "order_cycle_form.$dirty", persist: "true" }
%input{ type: "button", value: t('.previous'), ng: { click: "cancel('#{main_app.edit_admin_order_cycle_path(@order_cycle)}')", disabled: "order_cycle_form.$dirty" } }

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

@@ -2,10 +2,9 @@
= t :edit_order_cycle
= admin_inject_order_cycle_instance
= form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.orderCycles', 'ng-controller' => 'AdminEditOrderCycleCtrl', name: 'order_cycle_form'} do |f|
= 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|
%div{ 'ng-controller' => 'AdminOrderCycleOutgoingCtrl' }
= render 'wizard_progress'
= render 'wizard_progress'
%save-bar{ dirty: "order_cycle_form.$dirty", persist: "true" }
%input{ type: "button", value: t('.previous'), ng: { click: "cancel('#{main_app.admin_order_cycle_incoming_path(@order_cycle)}')", disabled: "order_cycle_form.$dirty" } }