# HG changeset patch
# User Chloe Laisne <chloe.laisne@gmail.com>
# Date 1466671317 -7200
# Node ID 541e26eb356f98f2e3b334853d9a6876174f333d
# Parent  7b266ccf6d3d207a8f987ee13fcda5fd8292e836
Display filter IDs
Remove unused transitionTo/updateURL methods managed by filter service

diff -r 7b266ccf6d3d -r 541e26eb356f cms/app-client/app/components/discourses-component.js
--- a/cms/app-client/app/components/discourses-component.js	Wed Jun 22 22:13:46 2016 +0200
+++ b/cms/app-client/app/components/discourses-component.js	Thu Jun 23 10:41:57 2016 +0200
@@ -9,10 +9,6 @@
     constants: Ember.inject.service(),
     filter: Ember.inject.service(),
 
-    init: function() {
-        this._super(...arguments);
-    },
-
     didRender: function() {
         var self = this;
         var baseURL = env.baseURL.replace(/\/$/,"")+'/api/v1';
diff -r 7b266ccf6d3d -r 541e26eb356f cms/app-client/app/components/filter-component.js
--- a/cms/app-client/app/components/filter-component.js	Wed Jun 22 22:13:46 2016 +0200
+++ b/cms/app-client/app/components/filter-component.js	Thu Jun 23 10:41:57 2016 +0200
@@ -1,15 +1,15 @@
 import Ember from 'ember';
 
 export default Ember.Component.extend({
-	
-	classNames: ['filter-component'],
+    
+    classNames: ['filter-component'],
 
-	filter: Ember.inject.service(),
+    filter: Ember.inject.service(),
 
-	actions: {
-		removeFilter: function(key, value) {
-			this.get('filter').set(key, value);
-		}
-	}
+    actions: {
+        removeFilter: function(key, value) {
+            this.get('filter').set(key, value);
+        }
+    }
 
 });
diff -r 7b266ccf6d3d -r 541e26eb356f cms/app-client/app/components/visu-langues.js
--- a/cms/app-client/app/components/visu-langues.js	Wed Jun 22 22:13:46 2016 +0200
+++ b/cms/app-client/app/components/visu-langues.js	Thu Jun 23 10:41:57 2016 +0200
@@ -6,6 +6,7 @@
 export default Ember.Component.extend({
 
     constants: Ember.inject.service(),
+    filter: Ember.inject.service(),
 
     didInsertElement: function(){
         var self = this;
@@ -180,7 +181,7 @@
 
                 function selectHandler (d){
                     if (d.id){
-                        self.get('setQueryParameters')(d.id);
+                        self.get('filter').set('language', d.id);
                     }
                 }
 
diff -r 7b266ccf6d3d -r 541e26eb356f cms/app-client/app/controllers/application.js
--- a/cms/app-client/app/controllers/application.js	Wed Jun 22 22:13:46 2016 +0200
+++ b/cms/app-client/app/controllers/application.js	Thu Jun 23 10:41:57 2016 +0200
@@ -8,18 +8,16 @@
         theme: 'thematique'
     }],
 
-    filter: Ember.inject.service(),
-
     date: [],
     discourse: null,
     language: null,
     location: null,
     theme: null,
 
+    filter: Ember.inject.service(),
     setFilter: Ember.observer('date', 'discourse', 'language', 'location', 'theme', function(sender, key) {
         this.get('filter').set(key, this.get(key));
     }),
-
     filterObserver: Ember.observer('filter.date', 'filter.discourse', 'filter.language', 'filter.location', 'filter.theme', function(sender, key) {
         key = key.split('.').pop();
         this.set(key, this.get('filter').get(key));
diff -r 7b266ccf6d3d -r 541e26eb356f cms/app-client/app/controllers/tabs/carto.js
--- a/cms/app-client/app/controllers/tabs/carto.js	Wed Jun 22 22:13:46 2016 +0200
+++ b/cms/app-client/app/controllers/tabs/carto.js	Thu Jun 23 10:41:57 2016 +0200
@@ -1,9 +1,4 @@
 import Ember from 'ember';
 
 export default Ember.Controller.extend({
-  actions: {
-    updateUrl: function(selection){
-      this.transitionToRoute({queryParams: {location: selection}});
-    }
-  }
 });
diff -r 7b266ccf6d3d -r 541e26eb356f cms/app-client/app/controllers/tabs/chrono.js
--- a/cms/app-client/app/controllers/tabs/chrono.js	Wed Jun 22 22:13:46 2016 +0200
+++ b/cms/app-client/app/controllers/tabs/chrono.js	Thu Jun 23 10:41:57 2016 +0200
@@ -1,19 +1,4 @@
 import Ember from 'ember';
 
 export default Ember.Controller.extend({
-
-	filter: Ember.inject.service(),
-
-    actions: {
-        updateUrl: function(action, selection){
-        	console.log('updateUrl', action, selection);
-        	if(action === 'add') {
-        		console.log('updateUrl', action, selection);
-        		this.get('filter').set('date', selection);
-        	} else if(action === 'remove') {
-        		this.get('filter').remove('date', selection);
-        	}
-            //this.transitionToRoute({queryParams: {'date': selection}});
-        }
-    }
 });
diff -r 7b266ccf6d3d -r 541e26eb356f cms/app-client/app/controllers/tabs/discours.js
--- a/cms/app-client/app/controllers/tabs/discours.js	Wed Jun 22 22:13:46 2016 +0200
+++ b/cms/app-client/app/controllers/tabs/discours.js	Thu Jun 23 10:41:57 2016 +0200
@@ -2,10 +2,4 @@
 
 export default Ember.Controller.extend({
 
-    actions: {
-        transitionTo: function(id) {
-            this.transitionToRoute({ queryParams: { 'discours': id } });
-        }   
-    }
-    
 });
diff -r 7b266ccf6d3d -r 541e26eb356f cms/app-client/app/controllers/tabs/langues.js
--- a/cms/app-client/app/controllers/tabs/langues.js	Wed Jun 22 22:13:46 2016 +0200
+++ b/cms/app-client/app/controllers/tabs/langues.js	Thu Jun 23 10:41:57 2016 +0200
@@ -1,12 +1,4 @@
 import Ember from 'ember';
 
 export default Ember.Controller.extend({
-
-	filter: Ember.inject.service(),
-
-	actions: {
-        transitionTo: function(id) {
-        	this.get('filter').set('language', id);
-        }   
-    }
 });
diff -r 7b266ccf6d3d -r 541e26eb356f cms/app-client/app/controllers/tabs/thematiques.js
--- a/cms/app-client/app/controllers/tabs/thematiques.js	Wed Jun 22 22:13:46 2016 +0200
+++ b/cms/app-client/app/controllers/tabs/thematiques.js	Thu Jun 23 10:41:57 2016 +0200
@@ -1,12 +1,4 @@
 import Ember from 'ember';
 
 export default Ember.Controller.extend({
-
-    actions: {
-
-        transitionTo: function(id){
-            this.transitionToRoute({queryParams: {thematique: id}});
-        }
-
-    }
 });
diff -r 7b266ccf6d3d -r 541e26eb356f cms/app-client/app/routes/tabs/carto.js
--- a/cms/app-client/app/routes/tabs/carto.js	Wed Jun 22 22:13:46 2016 +0200
+++ b/cms/app-client/app/routes/tabs/carto.js	Thu Jun 23 10:41:57 2016 +0200
@@ -1,9 +1,11 @@
 import Ember from 'ember';
 
 export default Ember.Route.extend({
-  actions: {
-    queryParamsDidChange: function() {
-      console.log("carto params");
-    },
-  }
+
+    actions: {
+        queryParamsDidChange: function() {
+            console.log("carto params");
+        },
+    }
+
 });
diff -r 7b266ccf6d3d -r 541e26eb356f cms/app-client/app/routes/tabs/discours.js
--- a/cms/app-client/app/routes/tabs/discours.js	Wed Jun 22 22:13:46 2016 +0200
+++ b/cms/app-client/app/routes/tabs/discours.js	Thu Jun 23 10:41:57 2016 +0200
@@ -1,5 +1,4 @@
 import Ember from 'ember';
 
 export default Ember.Route.extend({
-	
 });
\ No newline at end of file
diff -r 7b266ccf6d3d -r 541e26eb356f cms/app-client/app/services/filter.js
--- a/cms/app-client/app/services/filter.js	Wed Jun 22 22:13:46 2016 +0200
+++ b/cms/app-client/app/services/filter.js	Thu Jun 23 10:41:57 2016 +0200
@@ -2,10 +2,10 @@
 
 export default Ember.Service.extend({
 
-	dates: [],
-	discourse: null,
-	language: null,
-	location: null,
-	theme: null
+    dates: [],
+    discourse: null,
+    language: null,
+    location: null,
+    theme: null
 
 });
diff -r 7b266ccf6d3d -r 541e26eb356f cms/app-client/app/templates/components/filter-component.hbs
--- a/cms/app-client/app/templates/components/filter-component.hbs	Wed Jun 22 22:13:46 2016 +0200
+++ b/cms/app-client/app/templates/components/filter-component.hbs	Thu Jun 23 10:41:57 2016 +0200
@@ -3,18 +3,18 @@
 {{#if filter.location}}
     <li class="filter location">{{filter.location}}<span{{action 'removeFilter' 'location'}}>&#10005;</span></li>
 {{/if}}
-{{#if filter.langue}}
-    <li class="filter langue">{{filter.langue}}<span{{action 'removeFilter' 'langue'}}>&#10005;</span></li>
+{{#if filter.language}}
+    <li class="filter language">{{filter.language}}<span{{action 'removeFilter' 'language'}}>&#10005;</span></li>
 {{/if}}
-{{#if filter.discours}}
-<li class="filter discours">{{filter.discours}}<span{{action 'removeFilter' 'discours'}}>&#10005;</span></li>
+{{#if filter.discourse}}
+<li class="filter discourse">{{filter.discourse}}<span{{action 'removeFilter' 'discourse'}}>&#10005;</span></li>
 {{/if}}
-{{#if dateIntervals}}
-    {{#each dateIntervals as |item| }}
-    <li class="filter date" data-dates="{{item}}">{{interval item}}<span{{action 'removeFilter' 'date' item }}>&#10005;</span></li>
+{{#if filter.date}}
+    {{#each filter.date as |item| }}
+    <li class="filter date" data-dates="{{item}}">{{item}}<span{{action 'removeFilter' 'date' item }}>&#10005;</span></li>
     {{/each}}
 {{/if}}
-{{#if filter.thematique}}
-    <li class="filter thematique">{{filter.thematique}}<span{{action 'removeFilter' 'thematique'}}>&#10005;</span></li>
+{{#if filter.theme}}
+    <li class="filter theme">{{filter.theme}}<span{{action 'removeFilter' 'theme'}}>&#10005;</span></li>
 {{/if}}
 </ul>
\ No newline at end of file
diff -r 7b266ccf6d3d -r 541e26eb356f cms/app-client/app/templates/tabs/carto.hbs
--- a/cms/app-client/app/templates/tabs/carto.hbs	Wed Jun 22 22:13:46 2016 +0200
+++ b/cms/app-client/app/templates/tabs/carto.hbs	Thu Jun 23 10:41:57 2016 +0200
@@ -1,1 +1,1 @@
-{{visu-carto action="updateUrl" documents=model}}
+{{ visu-carto documents=model }}
diff -r 7b266ccf6d3d -r 541e26eb356f cms/app-client/app/templates/tabs/chrono.hbs
--- a/cms/app-client/app/templates/tabs/chrono.hbs	Wed Jun 22 22:13:46 2016 +0200
+++ b/cms/app-client/app/templates/tabs/chrono.hbs	Thu Jun 23 10:41:57 2016 +0200
@@ -1,3 +1,3 @@
 <h2>Sélectionner une date</h2>
 
-{{visu-chrono action="updateUrl"}}
+{{ visu-chrono }}
diff -r 7b266ccf6d3d -r 541e26eb356f cms/app-client/app/templates/tabs/discours.hbs
--- a/cms/app-client/app/templates/tabs/discours.hbs	Wed Jun 22 22:13:46 2016 +0200
+++ b/cms/app-client/app/templates/tabs/discours.hbs	Thu Jun 23 10:41:57 2016 +0200
@@ -1,1 +1,1 @@
-{{discourses-component setQueryParameters=( action 'transitionTo' ) }}
\ No newline at end of file
+{{discourses-component}}
\ No newline at end of file
diff -r 7b266ccf6d3d -r 541e26eb356f cms/app-client/app/templates/tabs/langues.hbs
--- a/cms/app-client/app/templates/tabs/langues.hbs	Wed Jun 22 22:13:46 2016 +0200
+++ b/cms/app-client/app/templates/tabs/langues.hbs	Thu Jun 23 10:41:57 2016 +0200
@@ -1,1 +1,1 @@
-{{visu-langues setQueryParameters=( action 'transitionTo' ) }}
+{{visu-langues}}
diff -r 7b266ccf6d3d -r 541e26eb356f cms/app-client/app/templates/tabs/thematiques.hbs
--- a/cms/app-client/app/templates/tabs/thematiques.hbs	Wed Jun 22 22:13:46 2016 +0200
+++ b/cms/app-client/app/templates/tabs/thematiques.hbs	Thu Jun 23 10:41:57 2016 +0200
@@ -1,5 +1,5 @@
 {{outlet}}
 
-{{ filtering-component themes=model setQueryParameters=( action 'transitionTo' ) }}
+{{ filtering-component themes=model }}
 
-{{ sorting-component themes=model setQueryParameters=( action 'transitionTo' ) }}
+{{ sorting-component themes=model }}