diff --git a/app/assets/javascripts/admin/order_cycles/controllers/create.js.coffee b/app/assets/javascripts/admin/order_cycles/controllers/create.js.coffee index b10d74eed7..d022b3e5ec 100644 --- a/app/assets/javascripts/admin/order_cycles/controllers/create.js.coffee +++ b/app/assets/javascripts/admin/order_cycles/controllers/create.js.coffee @@ -7,13 +7,9 @@ angular.module('admin.orderCycles') $scope.distributor_enterprises = Enterprise.hub_enterprises $scope.supplied_products = Enterprise.supplied_products $scope.enterprise_fees = EnterpriseFee.index(coordinator_id: ocInstance.coordinator_id) - $scope.schedules = Schedules.index({enterprise_id: ocInstance.coordinator_id}) - $scope.OrderCycle = OrderCycle $scope.order_cycle = OrderCycle.new({ coordinator_id: ocInstance.coordinator_id}) - $scope.StatusMessage = StatusMessage - $scope.view = 'general_settings' $scope.exchangeSelectedVariants = (exchange) -> diff --git a/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee b/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee index 9f5f91b1cf..7d35d3c91e 100644 --- a/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee +++ b/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee @@ -8,13 +8,9 @@ angular.module('admin.orderCycles') $scope.distributor_enterprises = Enterprise.hub_enterprises $scope.supplied_products = Enterprise.supplied_products $scope.enterprise_fees = EnterpriseFee.index(order_cycle_id: order_cycle_id) - $scope.schedules = Schedules.index({enterprise_id: ocInstance.coordinator_id}) - $scope.OrderCycle = OrderCycle $scope.order_cycle = OrderCycle.load(order_cycle_id) - $scope.StatusMessage = StatusMessage - $scope.view = 'general_settings' $scope.exchangeSelectedVariants = (exchange) -> diff --git a/app/assets/javascripts/admin/order_cycles/controllers/order_cycle_basic_controller.js.coffee b/app/assets/javascripts/admin/order_cycles/controllers/order_cycle_basic_controller.js.coffee index 48906182b3..70745cdfda 100644 --- a/app/assets/javascripts/admin/order_cycles/controllers/order_cycle_basic_controller.js.coffee +++ b/app/assets/javascripts/admin/order_cycles/controllers/order_cycle_basic_controller.js.coffee @@ -1,5 +1,9 @@ angular.module('admin.orderCycles') .controller 'AdminOrderCycleBasicCtrl', ($scope, $filter, $window, OrderCycle, Enterprise, EnterpriseFee, Schedules, RequestMonitor, ocInstance, StatusMessage) -> + $scope.StatusMessage = StatusMessage + $scope.OrderCycle = OrderCycle + $scope.schedules = Schedules.index({enterprise_id: ocInstance.coordinator_id}) + $scope.$watch 'order_cycle_form.$dirty', (newValue) -> StatusMessage.display 'notice', t("admin.unsaved_changes") if newValue diff --git a/app/assets/javascripts/admin/order_cycles/controllers/simple_create.js.coffee b/app/assets/javascripts/admin/order_cycles/controllers/simple_create.js.coffee index 2238b8e161..abcd88efa6 100644 --- a/app/assets/javascripts/admin/order_cycles/controllers/simple_create.js.coffee +++ b/app/assets/javascripts/admin/order_cycles/controllers/simple_create.js.coffee @@ -1,9 +1,6 @@ angular.module('admin.orderCycles').controller "AdminSimpleCreateOrderCycleCtrl", ($scope, $controller, $window, OrderCycle, Enterprise, EnterpriseFee, StatusMessage, Schedules, RequestMonitor, ocInstance) -> $controller('AdminOrderCycleBasicCtrl', {$scope: $scope}) - $scope.StatusMessage = StatusMessage - $scope.OrderCycle = OrderCycle - $scope.schedules = Schedules.index({enterprise_id: ocInstance.coordinator_id}) $scope.order_cycle = OrderCycle.new {coordinator_id: ocInstance.coordinator_id}, => # TODO: make this a get method, which only fetches one enterprise $scope.enterprises = Enterprise.index {coordinator_id: ocInstance.coordinator_id}, (enterprises) => diff --git a/app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee b/app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee index a650e9d067..6e300d3e34 100644 --- a/app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee +++ b/app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee @@ -4,11 +4,8 @@ angular.module('admin.orderCycles').controller "AdminSimpleEditOrderCycleCtrl", $scope.orderCycleId = -> $location.absUrl().match(/\/admin\/order_cycles\/(\d+)/)[1] - $scope.StatusMessage = StatusMessage $scope.enterprises = Enterprise.index(order_cycle_id: $scope.orderCycleId()) $scope.enterprise_fees = EnterpriseFee.index(order_cycle_id: $scope.orderCycleId()) - $scope.schedules = Schedules.index({enterprise_id: ocInstance.coordinator_id}) - $scope.OrderCycle = OrderCycle $scope.order_cycle = OrderCycle.load $scope.orderCycleId(), (order_cycle) => $scope.init()