osr-plastic/osr-discourse-src
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove modal state to choose move type. Instead use two buttons on the multi select popup, one

Browse Source 
for split and one for merge.
This commit is contained in:
Robin Ward
2013-05-16 14:22:41 -04:00
parent 1e9497d9ef
commit 7daca77443
9 changed files with 44 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/discourse/controllers/topic_controller.js
+13 -2
View File
@@ -72,11 +72,22 @@ Discourse.TopicController = Discourse.ObjectController.extend(Discourse.Selected
this.toggleProperty('summaryCollapsed');
},
moveSelected: function() {
splitTopic: function() {
var modalController = this.get('controllers.modal');
if (!modalController) return;
modalController.show(Discourse.MoveSelectedView.create({
modalController.show(Discourse.SplitTopicView.create({
topicController: this,
topic: this.get('content'),
selectedPosts: this.get('selectedPosts')
}));
},
mergeTopic: function() {
var modalController = this.get('controllers.modal');
if (!modalController) return;
modalController.show(Discourse.MergeTopicView.create({
topicController: this,
topic: this.get('content'),
selectedPosts: this.get('selectedPosts')