diff --git a/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6 b/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6 index 5e47258f7c..9ca1b990df 100644 --- a/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6 +++ b/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6 @@ -66,10 +66,9 @@ export default Ember.Controller.extend(ModalFunctionality, { }); const isPrivateMessage = this.get("model.isPrivateMessage"); - const canSplitTopic = this.get("canSplitTopic"); if (isPrivateMessage) { - this.set("selection", canSplitTopic ? "new_message" : "existing_message"); - } else if (!canSplitTopic) { + this.set("selection", this.get("canSplitToPM") ? "new_message" : "existing_message"); + } else if (!this.get("canSplitTopic")) { this.set("selection", "existing_topic"); Ember.run.next(() => $("#choose-topic-title").focus()); } @@ -85,6 +84,11 @@ export default Ember.Controller.extend(ModalFunctionality, { ); }, + @computed("canSplitTopic") + canSplitToPM(canSplitTopic) { + return canSplitTopic && (this.currentUser && this.currentUser.admin); + }, + actions: { performMove() { this.get("moveTypes").forEach(type => { diff --git a/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs b/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs index e268806e9b..3a0335af40 100644 --- a/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs +++ b/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs @@ -2,17 +2,17 @@ {{#if model.isPrivateMessage}}