--- 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() {
--- 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
--- 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 @@
<div id="audio" class="{{if (if-or player.transcript player.model.video) ' extra'}}{{if (if-and player.transcript player.model.video) ' multiple'}}">
<div class="controls">
- <i title="Backward" class="fa fa-backward{{if isFirst ' disabled'}}" {{action 'backward'}}>Backward</i>
+ <i title="Précédent" class="fa fa-backward{{if isFirst ' disabled'}}" {{action 'backward'}}>Précédent</i>
{{#if player.playing}}
<i title="Pause" class="fa fa-pause" {{action 'toggle'}}>Pause</i>
{{else}}
- <i title="Play" class="fa fa-play" {{action 'toggle'}}>Play</i>
+ <i title="Lecture" class="fa fa-play" {{action 'toggle'}}>Lecture</i>
{{/if}}
- <i title="Forward" class="fa fa-forward{{if isLast ' disabled'}}" {{action 'forward'}}>Forward</i>
+ <i title="Suivant" class="fa fa-forward{{if isLast ' disabled'}}" {{action 'forward'}}>Suivant</i>
</div>
<div class="progress">
<span class="head">{{to-minutes head}}</span>