From 69acaf864aea1fc39bc14e1ccd84d529af4461d2 Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Wed, 14 Jan 2015 08:46:22 +0100 Subject: [PATCH 1/2] ensure modal controller for supplier --- .../supplier/app/routes/application_route.js.coffee.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/javascripts/supplier/app/routes/application_route.js.coffee.erb b/app/assets/javascripts/supplier/app/routes/application_route.js.coffee.erb index 0b6c7e9c..8c5e915d 100644 --- a/app/assets/javascripts/supplier/app/routes/application_route.js.coffee.erb +++ b/app/assets/javascripts/supplier/app/routes/application_route.js.coffee.erb @@ -46,6 +46,7 @@ App.ApplicationRoute = Ember.Route.extend controller = @controllerFor("modals/#{modalName}") catch error controller = @controllerFor("modals/base") + controller ||= @controllerFor("modals/base") controller.set 'model', options.model defaultModalOptions = closeOnOverlay: true From 9e1d71697409393d2773c55bac723116ac3b9848 Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Wed, 14 Jan 2015 09:00:08 +0100 Subject: [PATCH 2/2] case insensitive product code filter --- .../app/components/menu_product_component.js.coffee | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/supplier/app/components/menu_product_component.js.coffee b/app/assets/javascripts/supplier/app/components/menu_product_component.js.coffee index e2ef994c..52de3720 100644 --- a/app/assets/javascripts/supplier/app/components/menu_product_component.js.coffee +++ b/app/assets/javascripts/supplier/app/components/menu_product_component.js.coffee @@ -3,12 +3,15 @@ App.MenuProductComponent = Ember.Component.extend code_filter: '' classNames: 'menu-product-container' classNameBindings: ['menu_product_class', 'editMode:editing'] - showProduct: (-> !@get('code_filter') or (@get('product.code') || "").match(@get('code_filter'))).property('code_filter') + showProduct: (-> + return true unless filter = @get('code_filter') + (@get('product.code') || "").toLowerCase().indexOf(filter.toLowerCase()) >= 0 + ).property('code_filter') menu_product_class: (-> "menu-product-#{@get('product.id') || 'new'}").property('product.id') code_filter_display: (-> return new Ember.Handlebars.SafeString(' ') unless code = @get('product.code') return code unless filter = @get('code_filter') - index = code.indexOf(filter) + index = code.toLowerCase().indexOf(filter.toLowerCase()) if index >= 0 pre_code = code.substring(0,index) highlight = code.substring(index,index + filter.length)