Refs #6449; Fix tags in timetables editor

4 files changed, 7 insertions, 5 deletions

diff --git a/app/javascript/time_tables/components/Metas.js b/app/javascript/time_tables/components/Metas.js
index d9746a379..186af540a 100644
--- a/app/javascript/time_tables/components/Metas.js
+++ b/app/javascript/time_tables/components/Metas.js
@@ -76,7 +76,6 @@ export default function Metas({metas, onUpdateDayTypes, onUpdateComment, onUpdat
             <label htmlFor="" className="control-label col-sm-4">{I18n.attribute_name('time_table', 'tag_list')}</label>
             <div className="col-sm-8">
               <TagsSelect2
-                initialTags={metas.initial_tags}
                 tags={metas.tags}
                 onSelect2Tags={(e) => onSelect2Tags(e)}
                 onUnselect2Tags={(e) => onUnselect2Tags(e)}
diff --git a/app/javascript/time_tables/components/TagsSelect2.js b/app/javascript/time_tables/components/TagsSelect2.js
index dd8d6e9c0..fe610ed58 100644
--- a/app/javascript/time_tables/components/TagsSelect2.js
+++ b/app/javascript/time_tables/components/TagsSelect2.js
@@ -27,7 +27,7 @@ export default class TagsSelect2 extends Component {
     return (
       <Select2
         value={(this.props.tags.length) ? map(this.props.tags, 'id') : undefined}
-        data={(this.props.initialTags.length) ? this.mapKeys(this.props.initialTags) : undefined}
+        data={(this.props.tags.length) ? this.mapKeys(this.props.tags) : undefined}
         onSelect={(e) => this.props.onSelect2Tags(e)}
         onUnselect={(e) => setTimeout( () => this.props.onUnselect2Tags(e, 150))}
         multiple={true}
@@ -74,4 +74,4 @@ export default class TagsSelect2 extends Component {
 
 const formatRepo = (props) => {
   if(props.name) return props.name
-}
\ No newline at end of file
+}
diff --git a/app/javascript/time_tables/containers/Metas.js b/app/javascript/time_tables/containers/Metas.js
index ebccf556e..7bc3ef4e1 100644
--- a/app/javascript/time_tables/containers/Metas.js
+++ b/app/javascript/time_tables/containers/Metas.js
@@ -24,6 +24,7 @@ const mapDispatchToProps = (dispatch) => {
     },
     onSelect2Tags: (e) => {
       e.preventDefault()
+      $(e.target).find('[data-select2-tag]').remove()
       dispatch(actions.select2Tags(e.params.data))
     },
     onUnselect2Tags: (e) => {
diff --git a/app/javascript/time_tables/reducers/metas.js b/app/javascript/time_tables/reducers/metas.js
index 51e1ec149..87917f580 100644
--- a/app/javascript/time_tables/reducers/metas.js
+++ b/app/javascript/time_tables/reducers/metas.js
@@ -31,11 +31,13 @@ export default function metas(state = {}, action) {
       return assign({}, state, {color: action.color})
     case 'UPDATE_SELECT_TAG':
       let tags = [...state.tags]
-      tags.push(action.selectedItem)
+      if(tags[tags.length-1].name != action.selectedItem.name){
+        tags.push(action.selectedItem)
+      }
       return assign({}, state, {tags: tags})
     case 'UPDATE_UNSELECT_TAG':
       return assign({}, state, {tags: filter(state.tags, (t) => (t.id != action.selectedItem.id))})
     default:
       return state
   }
-}
\ No newline at end of file
+}