codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-12-02 20:07:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix edit uncategorized when on the /category/uncategorized page

Browse source
This commit is contained in:
Neil Lalonde 2013-05-06 11:22:39 -04:00
parent b0945599b7
commit b944157d88
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/discourse/models/category.js
View file

@ -10,7 +10,11 @@ Discourse.Category = Discourse.Model.extend({
init: function() { init: function() {
this._super(); this._super();
if (!this.get('id') && this.get('name')) this.set('is_uncategorized', true); if (!this.get('id') && this.get('name')) {
this.set('is_uncategorized', true);
if (!this.get('color')) this.set('color', Discourse.SiteSettings.uncategorized_color);
if (!this.get('text_color')) this.set('text_color', Discourse.SiteSettings.uncategorized_text_color);
}
}, },
url: function() { url: function() {

6
app/models/site_setting.rb
View file

@ -86,9 +86,9 @@ class SiteSetting < ActiveRecord::Base
setting(:max_mentions_per_post, 10) setting(:max_mentions_per_post, 10)
setting(:newuser_max_mentions_per_post, 2) setting(:newuser_max_mentions_per_post, 2)
setting(:uncategorized_name, 'uncategorized') client_setting(:uncategorized_name, 'uncategorized')
setting(:uncategorized_color, 'AB9364'); client_setting(:uncategorized_color, 'AB9364');
setting(:uncategorized_text_color, 'FFFFFF'); client_setting(:uncategorized_text_color, 'FFFFFF');
setting(:unique_posts_mins, Rails.env.test? ? 0 : 5) setting(:unique_posts_mins, Rails.env.test? ? 0 : 5)