aboutsummaryrefslogtreecommitdiffstats
path: root/app/assets/javascripts/es6_browserified
diff options
context:
space:
mode:
authorThomas Haddad2017-04-27 12:05:35 +0200
committerThomas Haddad2017-04-27 12:05:35 +0200
commit513e0706e2b111d729a6d2a293cdf1347e1c64c1 (patch)
treec1cd149ff2f6488c9a7e3dcb0688b308f20136d8 /app/assets/javascripts/es6_browserified
parent4f3e42c0ca5da12503eaaf1de258a007edbdaae3 (diff)
downloadchouette-core-513e0706e2b111d729a6d2a293cdf1347e1c64c1.tar.bz2
Re-Add tags in metas for timetable edit
Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
Diffstat (limited to 'app/assets/javascripts/es6_browserified')
-rw-r--r--app/assets/javascripts/es6_browserified/time_tables/components/Metas.js4
-rw-r--r--app/assets/javascripts/es6_browserified/time_tables/components/TagsSelect2.js4
2 files changed, 5 insertions, 3 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 7add0ddfd..054546a84 100644
--- a/app/assets/javascripts/es6_browserified/time_tables/components/Metas.js
+++ b/app/assets/javascripts/es6_browserified/time_tables/components/Metas.js
@@ -71,7 +71,7 @@ const Metas = ({metas, onUpdateDayTypes, onUpdateComment, onUpdateColor, onSelec
</div>
{/* tags */}
- {/* <div className="form-group">
+ <div className="form-group">
<label htmlFor="" className="control-label col-sm-4">Etiquettes</label>
<div className="col-sm-8">
<TagsSelect2
@@ -79,10 +79,8 @@ const Metas = ({metas, onUpdateDayTypes, onUpdateComment, onUpdateColor, onSelec
onSelect2Tags={(e) => onSelect2Tags(e)}
onUnselect2Tags={(e) => onUnselect2Tags(e)}
/>
- <input type="text" value='ton papa' className='form-control'/>
</div>
</div>
- */}
{/* calendar */}
<div className="form-group">
diff --git a/app/assets/javascripts/es6_browserified/time_tables/components/TagsSelect2.js b/app/assets/javascripts/es6_browserified/time_tables/components/TagsSelect2.js
index 16ebc250a..084dd1ea8 100644
--- a/app/assets/javascripts/es6_browserified/time_tables/components/TagsSelect2.js
+++ b/app/assets/javascripts/es6_browserified/time_tables/components/TagsSelect2.js
@@ -31,6 +31,10 @@ class TagsSelect2 extends React.Component{
multiple={true}
ref='tags_id'
options={{
+ tags:true,
+ createTag: function(params) {
+ return {name: params.term, text: params.term, id: params.term}
+ },
allowClear: true,
theme: 'bootstrap',
width: '100%',