diff --git a/app/assets/javascripts/discourse/components/bulk-select-button.js.es6 b/app/assets/javascripts/discourse/components/bulk-select-button.js.es6 index fd5d459462..96f08fd76d 100644 --- a/app/assets/javascripts/discourse/components/bulk-select-button.js.es6 +++ b/app/assets/javascripts/discourse/components/bulk-select-button.js.es6 @@ -3,7 +3,13 @@ import showModal from 'discourse/lib/show-modal'; export default Ember.Component.extend({ actions: { 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()); } } diff --git a/app/assets/javascripts/discourse/components/login-reply-button.js.es6 b/app/assets/javascripts/discourse/components/login-reply-button.js.es6 index e162faf267..80acc342a1 100644 --- a/app/assets/javascripts/discourse/components/login-reply-button.js.es6 +++ b/app/assets/javascripts/discourse/components/login-reply-button.js.es6 @@ -1,7 +1,7 @@ import Button from 'discourse/components/d-button'; export default Button.extend({ - label: 'topic.reply.title', + label: 'topic.reply.topic.title', icon: 'reply', action: 'showLogin' }); diff --git a/app/assets/javascripts/discourse/components/tag-group-chooser.js.es6 b/app/assets/javascripts/discourse/components/tag-group-chooser.js.es6 index ae9498af2b..efe35db5bb 100644 --- a/app/assets/javascripts/discourse/components/tag-group-chooser.js.es6 +++ b/app/assets/javascripts/discourse/components/tag-group-chooser.js.es6 @@ -8,12 +8,14 @@ export default Ember.TextField.extend({ _initValue: function() { const names = this.get('tagGroups') || []; - this.set('value', names.join(", ")); + this.set('value', names.join(",")); }.on('init'), _valueChanged: function() { const names = this.get('value').split(',').map(v => v.trim()).reject(v => v.length === 0).uniq(); - this.set('tagGroups', names); + if ( this.get('tagGroups').join(',') !== this.get('value') ) { + this.set('tagGroups', names); + } }.observes('value'), _tagGroupsChanged: function() { diff --git a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6 b/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6 index e3a7a34f21..ba5e6de179 100644 --- a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6 +++ b/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6 @@ -22,6 +22,7 @@ export default Ember.Controller.extend(ModalFunctionality, { buttonRows: null, emptyTags: Ember.computed.empty('tags'), + categoryId: Ember.computed.alias('model.category.id'), onShow() { this.set('modal.modalClass', 'topic-bulk-actions-modal small'); @@ -44,8 +45,8 @@ export default Ember.Controller.extend(ModalFunctionality, { perform(operation) { this.set('loading', true); - const topics = this.get('model'); - return Discourse.Topic.bulkOperation(this.get('model'), operation).then(result => { + const topics = this.get('model.topics'); + return Discourse.Topic.bulkOperation(topics, operation).then(result => { this.set('loading', false); if (result && result.topic_ids) { return result.topic_ids.map(t => topics.findBy('id', t)); diff --git a/app/assets/javascripts/discourse/templates/bulk-tag.hbs b/app/assets/javascripts/discourse/templates/bulk-tag.hbs index 1ffe345e30..636f83cb34 100644 --- a/app/assets/javascripts/discourse/templates/bulk-tag.hbs +++ b/app/assets/javascripts/discourse/templates/bulk-tag.hbs @@ -1,5 +1,5 @@

{{i18n "topics.bulk.choose_new_tags"}}

-

{{tag-chooser tags=tags}}

+

{{tag-chooser tags=tags categoryId=categoryId}}

{{d-button action="changeTags" disabled=emptyTags label="topics.bulk.change_tags"}} diff --git a/app/assets/javascripts/discourse/templates/components/signup-cta.hbs b/app/assets/javascripts/discourse/templates/components/signup-cta.hbs index e4a4ff28d2..8ee2d5b1aa 100644 --- a/app/assets/javascripts/discourse/templates/components/signup-cta.hbs +++ b/app/assets/javascripts/discourse/templates/components/signup-cta.hbs @@ -2,7 +2,6 @@ {{#if session.hideSignupCta}}

{{i18n "signup_cta.hidden_for_session"}} - {{i18n "signup_cta.hide_forever"}}

{{else}}

{{replace-emoji (i18n "signup_cta.intro")}}

diff --git a/app/assets/javascripts/discourse/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/discovery/topics.hbs index 8d0ab34d9e..22e5eb3a60 100644 --- a/app/assets/javascripts/discourse/templates/discovery/topics.hbs +++ b/app/assets/javascripts/discourse/templates/discovery/topics.hbs @@ -13,7 +13,7 @@ {{/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}} {{#if top}} diff --git a/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs b/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs index caa2e71d2a..9b10ef6c29 100644 --- a/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs +++ b/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs @@ -1,4 +1,4 @@ {{#d-modal-body}} -

{{{i18n 'topics.bulk.selected' count=model.length}}}

+

{{{i18n 'topics.bulk.selected' count=model.topics.length}}}

{{outlet "bulkOutlet"}} {{/d-modal-body}} diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs index bd02891d6b..72842995af 100644 --- a/app/assets/javascripts/discourse/templates/topic.hbs +++ b/app/assets/javascripts/discourse/templates/topic.hbs @@ -200,7 +200,7 @@ replyToPost=(action "replyToPost") }} {{else}} - {{d-button icon="reply" class="btn-primary" action="showLogin" label="topic.reply.title"}} + {{d-button icon="reply" class="btn-primary" action="showLogin" label="topic.reply.topic.title"}} {{/if}} {{/if}} diff --git a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 index ca925d343d..8c33b126af 100644 --- a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 +++ b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 @@ -377,7 +377,7 @@ export default createWidget('topic-timeline', { controls.push(this.attach('button', { className: 'btn create', icon: 'reply', - title: 'topic.reply.help', + title: 'topic.reply.topic.help', action: 'replyToPost' })); } diff --git a/lib/version.rb b/lib/version.rb index 7d5c307522..ed6702f18c 100644 --- a/lib/version.rb +++ b/lib/version.rb @@ -5,7 +5,7 @@ module Discourse MAJOR = 1 MINOR = 8 TINY = 0 - PRE = 'beta3' + PRE = 'beta4' STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end