IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1744 from verg/prevent_delete_uncategorized

Browse Source 
Prevent deleting 'uncategorized' category
This commit is contained in:
Sam
2014-01-01 16:09:49 -08:00
parent 3681f69085 8a830fb8e3
commit 126433cf65
5 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/controllers/edit_category_controller.js
View File

@@ -53,7 +53,7 @@ Discourse.EditCategoryController = Discourse.ObjectController.extend(Discourse.M
}.property('saving', 'name', 'color', 'deleting'),
deleteVisible: function() {
return (this.get('id') && this.get('topic_count') === 0);
return (this.get('id') && this.get('topic_count') === 0 && !this.get("isUncategorizedCategory"));
}.property('id', 'topic_count'),
deleteDisabled: function() {

5
app/assets/javascripts/discourse/models/category.js
View File

@@ -168,8 +168,11 @@ Discourse.Category = Discourse.Model.extend({
if (stats.length === 2) return false;
}, this);
return stats;
}
},
isUncategorizedCategory: function() {
return this.get('id') === Discourse.Site.currentProp("uncategorized_category_id");
}.property('id')
});
Discourse.Category.reopenClass({