rename 'is_support' to 'contains_messages'
This commit is contained in:
@@ -21,7 +21,7 @@ export default ComboboxView.extend({
|
||||
return categories.filter(c => {
|
||||
if (scopedCategoryId && c.get('id') !== scopedCategoryId && c.get('parent_category_id') !== scopedCategoryId) { return false; }
|
||||
if (c.get('isUncategorizedCategory')) { return false; }
|
||||
if (c.get('is_support')) { return false; }
|
||||
if (c.get('contains_messages')) { return false; }
|
||||
return c.get('permission') === Discourse.PermissionType.FULL;
|
||||
});
|
||||
},
|
||||
|
||||
@@ -81,8 +81,8 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
|
||||
@computed("model.isPrivateMessage", "model.category_id")
|
||||
showCategoryChooser(isPrivateMessage, categoryId) {
|
||||
const category = Discourse.Category.findById(categoryId);
|
||||
const isSupport = category && category.get("is_support");
|
||||
return !isPrivateMessage && !isSupport;
|
||||
const containsMessages = category && category.get("contains_messages");
|
||||
return !isPrivateMessage && !containsMessages;
|
||||
},
|
||||
|
||||
actions: {
|
||||
|
||||
@@ -86,7 +86,7 @@ const Category = RestModel.extend({
|
||||
custom_fields: this.get('custom_fields'),
|
||||
topic_template: this.get('topic_template'),
|
||||
suppress_from_homepage: this.get('suppress_from_homepage'),
|
||||
is_support: this.get("is_support"),
|
||||
contains_messages: this.get("contains_messages"),
|
||||
},
|
||||
type: this.get('id') ? 'PUT' : 'POST'
|
||||
});
|
||||
|
||||
@@ -71,8 +71,8 @@ const Composer = RestModel.extend({
|
||||
showCategoryChooser(isPrivateMessage, hasOptions, categoryId) {
|
||||
const manyCategories = Discourse.Category.list().length > 1;
|
||||
const category = Discourse.Category.findById(categoryId);
|
||||
const isSupport = category && category.get("is_support");
|
||||
return !isPrivateMessage && !isSupport && (hasOptions || manyCategories);
|
||||
const containsMessages = category && category.get("contains_messages");
|
||||
return !isPrivateMessage && !containsMessages && (hasOptions || manyCategories);
|
||||
},
|
||||
|
||||
privateMessage: function(){
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
{{#if emailInEnabled}}
|
||||
<section class='field'>
|
||||
<label>
|
||||
{{input type="checkbox" checked=category.is_support}}
|
||||
{{i18n 'category.email_in_allow_strangers'}}
|
||||
{{input type="checkbox" checked=category.contains_messages}}
|
||||
{{i18n 'category.contains_messages'}}
|
||||
</label>
|
||||
</section>
|
||||
<section class='field'>
|
||||
|
||||
Reference in New Issue
Block a user