# HG changeset patch # User ymh # Date 1478611201 -3600 # Node ID 9ff56cc0c656ff11a1f4ec2f3f25b36dfa551fe6 # Parent bc39bcecf6a45c5206333a6e9e4c12b393460512 reset pagination when filter change, translate player button diff -r bc39bcecf6a4 -r 9ff56cc0c656 cms/app-client/app/controllers/application.js --- a/cms/app-client/app/controllers/application.js Tue Nov 08 11:25:29 2016 +0100 +++ b/cms/app-client/app/controllers/application.js Tue Nov 08 14:20:01 2016 +0100 @@ -32,12 +32,15 @@ location: null, theme: null, - languageObserver: Ember.observer('language', 'date', 'date.[]', 'discourse', 'discourse.[]', 'location', 'theme', 'theme.[]', function() { + localObserver: Ember.observer('language', 'date', 'date.[]', 'discourse', 'discourse.[]', 'location', 'theme', 'theme.[]', function() { this.get('filter').setProperties(this.getProperties('language', 'date', 'discourse', 'theme', 'location')); + // need to reset pagination + this.set("page", 1); }), filterObserver: Ember.observer('filter', 'filter.language', 'filter.date', 'filter.date.[]', 'filter.discourse', 'filter.discourse.[]', 'filter.location', 'filter.theme', 'filter.theme.[]', function() { - this.set('language', this.get('filter').get('language')); this.setProperties(this.get('filter').getProperties('language', 'date', 'discourse', 'theme', 'location')); + // need to reset pagination + this.set("page", 1); }), itemObserver: Ember.observer('player.item', function() { diff -r bc39bcecf6a4 -r 9ff56cc0c656 cms/app-client/app/routes/application.js --- a/cms/app-client/app/routes/application.js Tue Nov 08 11:25:29 2016 +0100 +++ b/cms/app-client/app/routes/application.js Tue Nov 08 14:20:01 2016 +0100 @@ -9,14 +9,13 @@ filter: Ember.inject.service(), constants: Ember.inject.service(), - model: Ember.observer('page', function(params) { - var filterQueryArgs = _.clone(this.get('filter').get('queryParamsValues')); - var promise = this.store.query('document', _.merge(filterQueryArgs, { + model: function(params) { + let filterQueryArgs = _.clone(this.get('filter').get('queryParamsValues')); + return this.store.query('document', _.merge(filterQueryArgs, { page: params['page'], perpage: this.get('constants').DOCUMENTS_PAGINATION_PERPAGE })); - return promise; - }), + }, /** Serializes value of the query parameter based on defaultValueType diff -r bc39bcecf6a4 -r 9ff56cc0c656 cms/app-client/app/templates/components/player-component.hbs --- a/cms/app-client/app/templates/components/player-component.hbs Tue Nov 08 11:25:29 2016 +0100 +++ b/cms/app-client/app/templates/components/player-component.hbs Tue Nov 08 14:20:01 2016 +0100 @@ -1,12 +1,12 @@
- Backward + Précédent {{#if player.playing}} Pause {{else}} - Play + Lecture {{/if}} - Forward + Suivant
{{to-minutes head}}