Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: bulk change tags works with category tag settings

This commit is contained in:
Neil Lalonde 2017-01-26 16:36:53 -05:00
parent 6e47e02738
commit 0e8808fbe8
5 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/discourse/components/bulk-select-button.js.es6
View File

@ -3,7 +3,13 @@ import showModal from 'discourse/lib/show-modal';
export default Ember.Component.extend({ export default Ember.Component.extend({
actions: { actions: {
showBulkActions() { showBulkActions() {
const controller = showModal('topic-bulk-actions', { model: this.get('selected'), title: 'topics.bulk.actions' }); const controller = showModal('topic-bulk-actions', {
model: {
topics: this.get('selected'),
category: this.get('category')
},
title: 'topics.bulk.actions'
});
controller.set('refreshClosure', () => this.sendAction()); controller.set('refreshClosure', () => this.sendAction());
} }
} }

5
app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6
View File

@ -22,6 +22,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
buttonRows: null, buttonRows: null,
emptyTags: Ember.computed.empty('tags'), emptyTags: Ember.computed.empty('tags'),
categoryId: Ember.computed.alias('model.category.id'),
onShow() { onShow() {
this.set('modal.modalClass', 'topic-bulk-actions-modal small'); this.set('modal.modalClass', 'topic-bulk-actions-modal small');
@ -44,8 +45,8 @@ export default Ember.Controller.extend(ModalFunctionality, {
perform(operation) { perform(operation) {
this.set('loading', true); this.set('loading', true);
const topics = this.get('model'); const topics = this.get('model.topics');
return Discourse.Topic.bulkOperation(this.get('model'), operation).then(result => { return Discourse.Topic.bulkOperation(topics, operation).then(result => {
this.set('loading', false); this.set('loading', false);
if (result && result.topic_ids) { if (result && result.topic_ids) {
return result.topic_ids.map(t => topics.findBy('id', t)); return result.topic_ids.map(t => topics.findBy('id', t));

2
app/assets/javascripts/discourse/templates/bulk-tag.hbs
View File

@ -1,5 +1,5 @@
<p>{{i18n "topics.bulk.choose_new_tags"}}</p> <p>{{i18n "topics.bulk.choose_new_tags"}}</p>
<p>{{tag-chooser tags=tags}}</p> <p>{{tag-chooser tags=tags categoryId=categoryId}}</p>
{{d-button action="changeTags" disabled=emptyTags label="topics.bulk.change_tags"}} {{d-button action="changeTags" disabled=emptyTags label="topics.bulk.change_tags"}}

2
app/assets/javascripts/discourse/templates/discovery/topics.hbs
View File

@ -13,7 +13,7 @@
</div> </div>
{{/if}} {{/if}}
{{bulk-select-button selected=selected action="refresh"}} {{bulk-select-button selected=selected action="refresh" category=category}}
{{#discovery-topics-list model=model refresh="refresh" incomingCount=topicTrackingState.incomingCount}} {{#discovery-topics-list model=model refresh="refresh" incomingCount=topicTrackingState.incomingCount}}
{{#if top}} {{#if top}}

2
app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
View File

@ -1,4 +1,4 @@
{{#d-modal-body}} {{#d-modal-body}}
<p>{{{i18n 'topics.bulk.selected' count=model.length}}}</p> <p>{{{i18n 'topics.bulk.selected' count=model.topics.length}}}</p>
{{outlet "bulkOutlet"}} {{outlet "bulkOutlet"}}
{{/d-modal-body}} {{/d-modal-body}}