From 663effc415399c61d22dadbc235bb7488022d191 Mon Sep 17 00:00:00 2001
From: Zog
Date: Wed, 24 Jan 2018 16:56:16 +0100
Subject: Refs #5682 @3h; Use same UI as for timetables

---
 app/javascript/time_tables/actions/index.js    |  5 +++--
 app/javascript/time_tables/components/Metas.js | 12 ++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'app/javascript/time_tables')

diff --git a/app/javascript/time_tables/actions/index.js b/app/javascript/time_tables/actions/index.js
index 87c7a3e8d..70f548174 100644
--- a/app/javascript/time_tables/actions/index.js
+++ b/app/javascript/time_tables/actions/index.js
@@ -246,7 +246,8 @@ const actions = {
     return error
   },
   fetchTimeTables: (dispatch, nextPage) => {
-    let urlJSON = window.location.pathname.split('/', 5).join('/')
+    let urlJSON = window.timetablesUrl || window.location.pathname.split('/', 5).join('/')
+
     if(nextPage) {
       urlJSON += "/month.json?date=" + nextPage
     }else{
@@ -277,7 +278,7 @@ const actions = {
     let strDayTypes = actions.arrayToStrDayTypes(metas.day_types)
     metas.day_types = strDayTypes
     let sentState = assign({}, timetable, metas)
-    let urlJSON = window.location.pathname.split('/', 5).join('/')
+    let urlJSON = window.timetablesUrl || window.location.pathname.split('/', 5).join('/')
     let hasError = false
     fetch(urlJSON + '.json', {
       credentials: 'same-origin',
diff --git a/app/javascript/time_tables/components/Metas.js b/app/javascript/time_tables/components/Metas.js
index 4170ba493..3c6848d27 100644
--- a/app/javascript/time_tables/components/Metas.js
+++ b/app/javascript/time_tables/components/Metas.js
@@ -27,7 +27,7 @@ export default function Metas({metas, onUpdateDayTypes, onUpdateComment, onUpdat
           </div>
 
           {/* color */}
-          <div className="form-group">
+          {metas.color !== undefined && <div className="form-group">
             <label htmlFor="" className="control-label col-sm-4">{I18n.activerecord.attributes.time_table.color}</label>
             <div className="col-sm-8">
               <div className="dropdown color_selector">
@@ -69,10 +69,10 @@ export default function Metas({metas, onUpdateDayTypes, onUpdateComment, onUpdat
                 </div>
               </div>
             </div>
-          </div>
+          </div>}
 
           {/* tags */}
-          <div className="form-group">
+          {metas.tags !== undefined && <div className="form-group">
             <label htmlFor="" className="control-label col-sm-4">{I18n.activerecord.attributes.time_table.tag_list}</label>
             <div className="col-sm-8">
               <TagsSelect2
@@ -82,15 +82,15 @@ export default function Metas({metas, onUpdateDayTypes, onUpdateComment, onUpdat
                 onUnselect2Tags={(e) => onUnselect2Tags(e)}
               />
             </div>
-          </div>
+          </div>}
 
           {/* calendar */}
-          <div className="form-group">
+          {metas.calendar !== null && <div className="form-group">
             <label htmlFor="" className="control-label col-sm-4">{I18n.activerecord.attributes.time_table.calendar}</label>
             <div className="col-sm-8">
               <span>{metas.calendar ? metas.calendar.name : I18n.time_tables.edit.metas.no_calendar}</span>
             </div>
-          </div>
+          </div>}
 
           {/* day_types */}
           <div className="form-group">
-- 
cgit v1.2.3