Version bump

This commit is contained in:
Neil Lalonde 2017-01-26 17:38:26 -05:00
commit 9fa29ca898
11 changed files with 21 additions and 13 deletions

View File

@ -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());
}
}

View File

@ -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'
});

View File

@ -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() {

View File

@ -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));

View File

@ -1,5 +1,5 @@
<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"}}

View File

@ -2,7 +2,6 @@
{{#if session.hideSignupCta}}
<p>
{{i18n "signup_cta.hidden_for_session"}}
<a {{action "neverShow"}}>{{i18n "signup_cta.hide_forever"}}</a>
</p>
{{else}}
<p>{{replace-emoji (i18n "signup_cta.intro")}}</p>

View File

@ -13,7 +13,7 @@
</div>
{{/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}}

View File

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

View File

@ -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}}

View File

@ -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'
}));
}

View File

@ -5,7 +5,7 @@ module Discourse
MAJOR = 1
MINOR = 8
TINY = 0
PRE = 'beta3'
PRE = 'beta4'
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
end