raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-13 23:37:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'use-save-bar' of https://github.com/bingxie/openfoodnetwork into use-save-bar

Browse Source 
Conflicts:
	app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
	app/assets/javascripts/templates/admin/save_bar.html.haml
	app/views/admin/order_cycles/edit.html.haml
	app/views/admin/variant_overrides/_products.html.haml
	app/views/spree/admin/orders/bulk_management.html.haml
This commit is contained in:
Rohan Mitchell
2016-05-13 10:05:39 +10:00
parent 8c747f02b5 f8ec0d316a
commit 7b994adc23
6 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
View File

@@ -1,5 +1,5 @@
angular.module('admin.orderCycles')
.controller 'AdminEditOrderCycleCtrl', ($scope, $filter, $location, OrderCycle, Enterprise, EnterpriseFee, StatusMessage) ->
.controller 'AdminEditOrderCycleCtrl', ($scope, $filter, $location, $window, OrderCycle, Enterprise, EnterpriseFee, StatusMessage) ->
order_cycle_id = $location.absUrl().match(/\/admin\/order_cycles\/(\d+)/)[1]
$scope.enterprises = Enterprise.index(order_cycle_id: order_cycle_id)
$scope.supplier_enterprises = Enterprise.producer_enterprises
@@ -88,3 +88,6 @@ angular.module('admin.orderCycles')
StatusMessage.display 'progress', "Saving..."
OrderCycle.update(destination)
$scope.order_cycle_form.$setPristine()
$scope.cancel = (destination) ->
$window.location = destination

7
app/assets/javascripts/templates/admin/save_bar.html.haml
View File

@@ -1,8 +1,7 @@
#save-bar.animate-show{ ng: { show: 'form.$dirty || StatusMessage.active()' } }
.container
.twelve.columns.alpha
.eight.columns.alpha
%h5#status-message{ ng: { style: 'StatusMessage.statusMessage.style' } }
{{ StatusMessage.statusMessage.text || " " }}
.four.columns.omega.text-right
%input.red{"ng-repeat" => "button in buttons", type: "button", value: "{{button.text}}", ng: { disabled: '!form.$dirty', click: "button.action(button.param)" } }
.eight.columns.omega.text-right
%input{"ng-repeat" => "button in buttons", type: "button", value: "{{button.text}}", ng: { class: "button.class", click: "button.action(button.param)" } }

2
app/assets/stylesheets/admin/components/save_bar.sass
View File

@@ -9,3 +9,5 @@
color: #5498da
h5
color: #5498da
input
margin-right: 5px

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

@@ -29,7 +29,7 @@
- ng_controller = order_cycles_simple_form ? 'AdminSimpleEditOrderCycleCtrl' : 'AdminEditOrderCycleCtrl'
= 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{ buttons: "[{ text: 'Update', action: submit, param: null }, { text: 'Update and Close', action: submit, param: '#{main_app.admin_order_cycles_path}' }]", form: "order_cycle_form" }
%save-bar{ buttons: "[{ text: 'Update', action: submit, param: null, class: 'red' }, { text: 'Update and Close', action: submit, param: '#{main_app.admin_order_cycles_path}', class: 'red' }, { text: 'Cancel', action: cancel, param: '#{main_app.admin_order_cycles_path}', class: '' }]", form: "order_cycle_form" }
- if order_cycles_simple_form
= render 'simple_form', f: f

2
app/views/admin/variant_overrides/_products.html.haml
View File

@@ -1,5 +1,5 @@
%form{ name: 'variant_overrides_form', ng: { show: "views.inventory.visible" } }
%save-bar{ form: "variant_overrides_form", buttons: "[{ text: 'Save Changes', action: update }]" }
%save-bar{ form: "variant_overrides_form", buttons: "[{ text: 'Save Changes', action: update, class: 'red' }]" }
%table.index.bulk#variant-overrides
%col.producer{ width: "20%", ng: { show: 'columns.producer.visible' } }
%col.product{ width: "20%", ng: { show: 'columns.product.visible' } }

2
app/views/spree/admin/orders/bulk_management.html.haml
View File

@@ -10,7 +10,7 @@
= render :partial => 'spree/admin/shared/order_sub_menu'
%div{ ng: { controller: 'LineItemsCtrl' } }
%save-bar{ form: "bulk_order_form", buttons: "[{ text: 'Save Changes', action: submit }]" }
%save-bar{ form: "bulk_order_form", buttons: "[{ text: 'Save Changes', action: submit, class: 'red' }]" }
.filters{ :class => "sixteen columns alpha" }
.date_filter{ :class => "two columns alpha" }
%label{ :for => 'start_date_filter' }