github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-24 05:34:28 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: javascript error when opening rename tag modal

Browse Source
This commit is contained in:
Neil Lalonde 2019-01-25 17:21:23 -05:00
parent 94e2b77c5f
commit cd3a167c63
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/javascripts/discourse/controllers/rename-tag.js.es6
View File

@ -1,16 +1,18 @@
import ModalFunctionality from "discourse/mixins/modal-functionality";
import computed from "ember-addons/ember-computed-decorators";
import BufferedContent from "discourse/mixins/buffered-content";
import { extractError } from "discourse/lib/ajax-error";
export default Ember.Controller.extend(ModalFunctionality, BufferedContent, {
renameDisabled: function() {
@computed("buffered.id", "id")
renameDisabled(inputTagName, currentTagName) {
const filterRegexp = new RegExp(this.site.tags_filter_regexp, "g"),
newId = this.get("buffered.id")
.replace(filterRegexp, "")
.trim();
newTagName = inputTagName
? inputTagName.replace(filterRegexp, "").trim()
: "";
return newId.length === 0 || newId === this.get("model.id");
}.property("buffered.id", "id"),
return newTagName.length === 0 || newTagName === currentTagName;
},
actions: {
performRename() {

8
app/assets/javascripts/discourse/templates/modal/rename-tag.hbs
View File

@ -1,8 +1,10 @@
{{#d-modal-body title="tagging.rename_tag"}}
<label>
<p>{{i18n "tagging.rename_instructions"}}</p>
{{input value=buffered.id maxlength=siteSettings.max_tag_length}}
<label class="control-label">
{{i18n "tagging.rename_instructions"}}
</label>
<div class="controls">
{{input value=buffered.id maxlength=siteSettings.max_tag_length}}
</div>
{{/d-modal-body}}
<div class="modal-footer">