raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-08 22:56:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Generalize sorting through SortOptions service

Browse Source
This commit is contained in:
Kristina Lim
2018-07-19 03:36:57 +08:00
committed by Maikel Linke
parent 8b6b694244
commit 55d0b1dfc5
4 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/admin/customers/controllers/customers_controller.js.coffee
View File

@@ -1,4 +1,4 @@
angular.module("admin.customers").controller "customersCtrl", ($scope, $q, $filter, Customers, TagRuleResource, CurrentShop, RequestMonitor, Columns, pendingChanges, shops, availableCountries) ->
angular.module("admin.customers").controller "customersCtrl", ($scope, $q, $filter, Customers, TagRuleResource, CurrentShop, RequestMonitor, Columns, SortOptions, pendingChanges, shops, availableCountries) ->
$scope.shops = shops
$scope.availableCountries = availableCountries
$scope.RequestMonitor = RequestMonitor
@@ -6,9 +6,7 @@ angular.module("admin.customers").controller "customersCtrl", ($scope, $q, $filt
$scope.customerLimit = 20
$scope.customers = Customers.all
$scope.columns = Columns.columns
$scope.sorting =
predicate: ""
reverse: true
$scope.sorting = SortOptions
$scope.confirmRefresh = (event) ->
event.preventDefault() unless pendingChanges.unsavedCount() == 0 || confirm(t("unsaved_changes_warning"))

4
app/assets/javascripts/admin/index_utils/services/sort_options.js.coffee Normal file
View File

@@ -0,0 +1,4 @@
angular.module("admin.indexUtils").factory 'SortOptions', ->
new class SortOptions
predicate: ""
reverse: true

6
app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee
View File

@@ -1,4 +1,4 @@
angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout, $http, $q, StatusMessage, Columns, Dereferencer, Orders, LineItems, Enterprises, OrderCycles, VariantUnitManager, RequestMonitor) ->
angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout, $http, $q, StatusMessage, Columns, SortOptions, Dereferencer, Orders, LineItems, Enterprises, OrderCycles, VariantUnitManager, RequestMonitor) ->
$scope.initialized = false
$scope.RequestMonitor = RequestMonitor
$scope.filteredLineItems = []
@@ -10,9 +10,7 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
$scope.selectedUnitsVariant = {}
$scope.sharedResource = false
$scope.columns = Columns.columns
$scope.sorting =
predicate: ""
reverse: true
$scope.sorting = SortOptions
$scope.confirmRefresh = ->
LineItems.allSaved() || confirm(t("unsaved_changes_warning"))

15
spec/javascripts/unit/admin/index_utils/services/sort_options_spec.js.coffee Normal file
View File

@@ -0,0 +1,15 @@
describe "SortOptions service", ->
SortOptions = null
beforeEach ->
module 'admin.indexUtils'
inject (_SortOptions_) ->
SortOptions = _SortOptions_
describe "initialising predicate", ->
it "sets predicate to blank", ->
expect(SortOptions.predicate).toEqual ""
describe "initialising reverse", ->
it "sets reverse to true", ->
expect(SortOptions.reverse).toBe true