diff --git a/app/assets/javascripts/my_modules.js b/app/assets/javascripts/my_modules.js index 7614e464d..cd5abc8b6 100644 --- a/app/assets/javascripts/my_modules.js +++ b/app/assets/javascripts/my_modules.js @@ -166,7 +166,7 @@ }, onUnSelect: (id) => { $.post(`${$(myModuleTagsSelector).data('update-module-tags-url')}/${id}/destroy_by_tag_id`) - .success(function() { + .done(() => { dropdownSelector.closeDropdown(myModuleTagsSelector); }) .fail(function(r) { diff --git a/app/javascript/vue/my_modules/modals/tags.vue b/app/javascript/vue/my_modules/modals/tags.vue index fd5154817..0cfc72844 100644 --- a/app/javascript/vue/my_modules/modals/tags.vue +++ b/app/javascript/vue/my_modules/modals/tags.vue @@ -187,7 +187,7 @@ export default { } }, created() { - this.loadAlltags(); + this.loadAlltags(false); }, methods: { startEditMode(tag) { @@ -211,15 +211,15 @@ export default { this.updateTag(this.tagToUpdate); } }, - loadAlltags() { + loadAlltags(emitTagsLoaded = true) { this.loadingTags = true; axios.get(this.projectTagsUrl).then((response) => { this.allTags = response.data.data; - this.loadAssignedTags(); + this.loadAssignedTags(emitTagsLoaded); }); }, - loadAssignedTags() { + loadAssignedTags(emitTagsLoaded = true) { axios.get(this.params.urls.assigned_tags).then((response) => { this.assignedTags = response.data.data; this.allTags.forEach((tag) => { @@ -231,7 +231,9 @@ export default { tag.assigned = false; } }); - this.$emit('tagsLoaded', this.allTags); + if (emitTagsLoaded) { + this.$emit('tagsLoaded', this.allTags); + } this.loadingTags = false; }); },