From 090ee5590f5eca6ca851ff701fe3f641585eb0e1 Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Wed, 30 Jul 2014 10:28:14 +0200 Subject: [PATCH] Fix table sorting by making use of casted_number property --- .../app/controllers/tables_index_controller.js.coffee | 2 +- app/assets/javascripts/supplier/app/models/table.js.coffee | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/supplier/app/controllers/tables_index_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/tables_index_controller.js.coffee index 8b4fbab7..b82c4bcb 100644 --- a/app/assets/javascripts/supplier/app/controllers/tables_index_controller.js.coffee +++ b/app/assets/javascripts/supplier/app/controllers/tables_index_controller.js.coffee @@ -1,5 +1,5 @@ Qsupplier.App.TablesIndexController = Ember.ArrayController.extend - tables: (-> @get('model').sortBy('number')).property('model.@each.number') + tables: (-> @get('model').sortBy('casted_number')).property('model.@each.number') actions: editTable: (table)-> @modal 'edit_table', diff --git a/app/assets/javascripts/supplier/app/models/table.js.coffee b/app/assets/javascripts/supplier/app/models/table.js.coffee index 787e3d96..9e524f09 100644 --- a/app/assets/javascripts/supplier/app/models/table.js.coffee +++ b/app/assets/javascripts/supplier/app/models/table.js.coffee @@ -14,3 +14,7 @@ Qsupplier.App.Table = DS.Model.extend #@get('list') #).property('list') occupied: (-> !!@get('active_list')).property('active_list.id') + + # Casted number to use in sortBy because a numberField will + # set property number to string value (TablesIndexController) + casted_number: (-> parseInt(@get('number'))).property('number')