Refs #2913: Set calendar to null when timetable is modified

Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>

4 files changed, 6 insertions, 6 deletions

diff --git a/app/assets/javascripts/es6_browserified/time_tables/components/Metas.js b/app/assets/javascripts/es6_browserified/time_tables/components/Metas.js
index 502320c27..a0fac84f3 100644
--- a/app/assets/javascripts/es6_browserified/time_tables/components/Metas.js
+++ b/app/assets/javascripts/es6_browserified/time_tables/components/Metas.js
@@ -87,7 +87,7 @@ const Metas = ({metas, onUpdateDayTypes, onUpdateComment, onUpdateColor, onSelec
           <div className="form-group">
             <label htmlFor="" className="control-label col-sm-4">Modèle de calendrier associé</label>
             <div className="col-sm-8">
-              <span>{metas.calendar.name}</span>
+              <span>{metas.calendar ? metas.calendar.name : 'Aucun'}</span>
             </div>
           </div>
 
diff --git a/app/assets/javascripts/es6_browserified/time_tables/index.js b/app/assets/javascripts/es6_browserified/time_tables/index.js
index 1fe6ee84b..01f8c428e 100644
--- a/app/assets/javascripts/es6_browserified/time_tables/index.js
+++ b/app/assets/javascripts/es6_browserified/time_tables/index.js
@@ -30,7 +30,7 @@ var initialState = {
     tags: [],
     initial_tags: [],
     color: '',
-    calendar: {}
+    calendar: null
   },
   pagination: {
     stateChanged: false,
diff --git a/app/assets/javascripts/es6_browserified/time_tables/reducers/metas.js b/app/assets/javascripts/es6_browserified/time_tables/reducers/metas.js
index 97de90225..4f1e7a528 100644
--- a/app/assets/javascripts/es6_browserified/time_tables/reducers/metas.js
+++ b/app/assets/javascripts/es6_browserified/time_tables/reducers/metas.js
@@ -10,15 +10,15 @@ const metas = (state = {}, action) => {
         tags: action.json.tags,
         initial_tags: action.json.tags,
         color: action.json.color,
-        calendar: action.json.calendar ? action.json.calendar : {name : 'Aucun'}
+        calendar: action.json.calendar ? action.json.calendar : null
       })
     case 'INCLUDE_DATE_IN_PERIOD':
     case 'EXCLUDE_DATE_FROM_PERIOD':
     case 'DELETE_PERIOD':
     case 'VALIDATE_PERIOD_FORM':
-      return _.assign({}, state, {calendar: {name: 'Aucun'}})
+      return _.assign({}, state, {calendar: null})
     case 'UPDATE_DAY_TYPES':
-      return _.assign({}, state, {day_types: action.dayTypes, calendar : {name: 'Aucun'}})
+      return _.assign({}, state, {day_types: action.dayTypes, calendar : null})
     case 'UPDATE_COMMENT':
       return _.assign({}, state, {comment: action.comment})
     case 'UPDATE_COLOR':
diff --git a/spec/javascripts/time_table/reducers/metas_spec.js b/spec/javascripts/time_table/reducers/metas_spec.js
index 79dbe1ea3..5ec7a0034 100644
--- a/spec/javascripts/time_table/reducers/metas_spec.js
+++ b/spec/javascripts/time_table/reducers/metas_spec.js
@@ -30,7 +30,7 @@ describe('metas reducer', () => {
         type: 'UPDATE_DAY_TYPES',
         dayTypes: arr
       })
-    ).toEqual(Object.assign({}, state, {day_types: arr, calendar: {name: 'Aucun'}}))
+    ).toEqual(Object.assign({}, state, {day_types: arr, calendar: null}))
   })
 
   it('should handle UPDATE_COMMENT', () => {