From 468cfa39f73e1b282db18b1cfe9ff83f337660be Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Wed, 29 May 2019 15:58:12 +0200 Subject: [PATCH] REFACTOR: rename-tag controller (#7634) --- .../discourse/controllers/rename-tag.js.es6 | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/rename-tag.js.es6 b/app/assets/javascripts/discourse/controllers/rename-tag.js.es6 index 63f4b81810..9a7a01d1ef 100644 --- a/app/assets/javascripts/discourse/controllers/rename-tag.js.es6 +++ b/app/assets/javascripts/discourse/controllers/rename-tag.js.es6 @@ -6,31 +6,28 @@ import { extractError } from "discourse/lib/ajax-error"; export default Ember.Controller.extend(ModalFunctionality, BufferedContent, { @computed("buffered.id", "id") renameDisabled(inputTagName, currentTagName) { - const filterRegexp = new RegExp(this.site.tags_filter_regexp, "g"), - newTagName = inputTagName - ? inputTagName.replace(filterRegexp, "").trim() - : ""; + const filterRegexp = new RegExp(this.site.tags_filter_regexp, "g"); + const newTagName = inputTagName + ? inputTagName.replace(filterRegexp, "").trim() + : ""; return newTagName.length === 0 || newTagName === currentTagName; }, actions: { performRename() { - const tag = this.model, - self = this; - tag + this.model .update({ id: this.get("buffered.id") }) - .then(function(result) { - self.send("closeModal"); + .then(result => { + this.send("closeModal"); + if (result.responseJson.tag) { - self.transitionToRoute("tags.show", result.responseJson.tag.id); + this.transitionToRoute("tags.show", result.responseJson.tag.id); } else { - self.flash(extractError(result.responseJson.errors[0]), "error"); + this.flash(extractError(result.responseJson.errors[0]), "error"); } }) - .catch(function(error) { - self.flash(extractError(error), "error"); - }); + .catch(error => this.flash(extractError(error), "error")); } } });