From 47cff0c79f06716d73ca279eb2080d9d01cf7311 Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Sun, 14 Jan 2018 15:00:26 -0300 Subject: [PATCH] test driven updates --- .../project/instance-action-value-display.coffee | 1 - addon/components/project/instance-action-value-display.js | 1 - addon/controllers/action-list.coffee | 6 +++--- addon/controllers/action-list.js | 6 ++---- addon/routes/action-list.coffee | 2 +- addon/routes/action-list.js | 2 +- addon/utils/panda-route-setup.coffee | 4 +++- addon/utils/panda-route-setup.js | 8 +++++++- tests/dummy/app/i18n/translations.coffee | 6 +++--- 9 files changed, 20 insertions(+), 16 deletions(-) diff --git a/addon/components/project/instance-action-value-display.coffee b/addon/components/project/instance-action-value-display.coffee index 56b81eb..c23366c 100644 --- a/addon/components/project/instance-action-value-display.coffee +++ b/addon/components/project/instance-action-value-display.coffee @@ -47,7 +47,6 @@ export default Ember.Component.extend actions: right_click: -> - debugger false #edit_record: -> # @modal 'project/edit-instance-action', model: @get('project_instance_action') diff --git a/addon/components/project/instance-action-value-display.js b/addon/components/project/instance-action-value-display.js index ea2f1e5..e229698 100644 --- a/addon/components/project/instance-action-value-display.js +++ b/addon/components/project/instance-action-value-display.js @@ -48,7 +48,6 @@ export default Ember.Component.extend({ }, actions: { right_click: function() { - debugger; return false; } } diff --git a/addon/controllers/action-list.coffee b/addon/controllers/action-list.coffee index a8c9ec1..82c5cc9 100644 --- a/addon/controllers/action-list.coffee +++ b/addon/controllers/action-list.coffee @@ -1,5 +1,5 @@ import Ember from 'ember' -import config from 'ember-get-config' +#import config from 'ember-get-config' export default Ember.Controller.extend session: Ember.inject.service('session') @@ -12,12 +12,12 @@ export default Ember.Controller.extend export_human_url: Ember.computed 'filters.filter_calls', -> model_name = 'panda/project-instance-action' base_url = @store.adapterFor(model_name).buildURL(model_name) - filter_addition = $.param q: @get('filter_query') + filter_addition = Ember.$.param q: @get('filter_query') "#{base_url}/export_human.csv?#{filter_addition}" export_technical_url: Ember.computed 'filters.filter_calls', -> model_name = 'panda/project-instance-action' base_url = @store.adapterFor(model_name).buildURL(model_name) - filter_addition = $.param q: @get('filter_query') + filter_addition = Ember.$.param q: @get('filter_query') "#{base_url}/export_technical.csv?#{filter_addition}" apply_filters: -> @incrementProperty 'filters.filter_calls' diff --git a/addon/controllers/action-list.js b/addon/controllers/action-list.js index 117e2b1..fb2c4ce 100644 --- a/addon/controllers/action-list.js +++ b/addon/controllers/action-list.js @@ -3,8 +3,6 @@ var slice = [].slice; import Ember from 'ember'; -import config from 'ember-get-config'; - export default Ember.Controller.extend({ session: Ember.inject.service('session'), filters: {}, @@ -19,7 +17,7 @@ export default Ember.Controller.extend({ var base_url, filter_addition, model_name; model_name = 'panda/project-instance-action'; base_url = this.store.adapterFor(model_name).buildURL(model_name); - filter_addition = $.param({ + filter_addition = Ember.$.param({ q: this.get('filter_query') }); return base_url + "/export_human.csv?" + filter_addition; @@ -28,7 +26,7 @@ export default Ember.Controller.extend({ var base_url, filter_addition, model_name; model_name = 'panda/project-instance-action'; base_url = this.store.adapterFor(model_name).buildURL(model_name); - filter_addition = $.param({ + filter_addition = Ember.$.param({ q: this.get('filter_query') }); return base_url + "/export_technical.csv?" + filter_addition; diff --git a/addon/routes/action-list.coffee b/addon/routes/action-list.coffee index d8fc5ed..4206389 100644 --- a/addon/routes/action-list.coffee +++ b/addon/routes/action-list.coffee @@ -17,7 +17,7 @@ export default Ember.Route.extend queryParams: q: refreshModel: true - setupController: (controller, model) -> + setupController: (controller) -> controller.set 'filters', default_filter @_super arguments... diff --git a/addon/routes/action-list.js b/addon/routes/action-list.js index e136a99..c526a3e 100644 --- a/addon/routes/action-list.js +++ b/addon/routes/action-list.js @@ -23,7 +23,7 @@ export default Ember.Route.extend({ refreshModel: true } }, - setupController: function(controller, model) { + setupController: function(controller) { controller.set('filters', default_filter); return this._super.apply(this, arguments); }, diff --git a/addon/utils/panda-route-setup.coffee b/addon/utils/panda-route-setup.coffee index 0e6db58..9865764 100644 --- a/addon/utils/panda-route-setup.coffee +++ b/addon/utils/panda-route-setup.coffee @@ -1,4 +1,4 @@ -export default pandaRouteSetup = (context) -> +pandaRouteSetup = (context) -> context.route 'project', -> @route 'show', path: ':project_id', -> @route 'dunlop' @@ -49,3 +49,5 @@ export default pandaRouteSetup = (context) -> @route 'tracker', -> @route 'tricks' # dummy/empty now, to genate the index true +export {pandaRouteSetup} +export default pandaRouteSetup diff --git a/addon/utils/panda-route-setup.js b/addon/utils/panda-route-setup.js index 81bf07b..2d6e6d6 100644 --- a/addon/utils/panda-route-setup.js +++ b/addon/utils/panda-route-setup.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript 1.12.5 var pandaRouteSetup; -export default pandaRouteSetup = function(context) { +pandaRouteSetup = function(context) { context.route('project', function() { return this.route('show', { path: ':project_id' @@ -76,3 +76,9 @@ export default pandaRouteSetup = function(context) { }); return true; }; + +export { + pandaRouteSetup +}; + +export default pandaRouteSetup; diff --git a/tests/dummy/app/i18n/translations.coffee b/tests/dummy/app/i18n/translations.coffee index 0815492..1dd9870 100644 --- a/tests/dummy/app/i18n/translations.coffee +++ b/tests/dummy/app/i18n/translations.coffee @@ -17,7 +17,7 @@ window.$translations = close: 'Close' confirm: cancel: 'Cancel' - confirm: 'Yes' + confirm: 'Ja' modals: edit_project: title: "Edit ${models.project} %{name}" @@ -27,8 +27,8 @@ window.$translations = title: "Edit ${models.tracker_subject} %{name}" edit_tracker_group: title: "Edit ${models.tracker_group} %{name}" - - confirm: 'Ja' + confirm: + title: 'Weet je dit zeker?' action: new_model: "New %{model}" select_model: 'Select %{model}'