Skip to content

Commit b944157

Browse files
committed
Fix edit uncategorized when on the /category/uncategorized page
1 parent b094559 commit b944157

2 files changed

Lines changed: 8 additions & 4 deletions

File tree

app/assets/javascripts/discourse/models/category.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ Discourse.Category = Discourse.Model.extend({
1010

1111
init: function() {
1212
this._super();
13-
if (!this.get('id') && this.get('name')) this.set('is_uncategorized', true);
13+
if (!this.get('id') && this.get('name')) {
14+
this.set('is_uncategorized', true);
15+
if (!this.get('color')) this.set('color', Discourse.SiteSettings.uncategorized_color);
16+
if (!this.get('text_color')) this.set('text_color', Discourse.SiteSettings.uncategorized_text_color);
17+
}
1418
},
1519

1620
url: function() {

app/models/site_setting.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ class SiteSetting < ActiveRecord::Base
8686
setting(:max_mentions_per_post, 10)
8787
setting(:newuser_max_mentions_per_post, 2)
8888

89-
setting(:uncategorized_name, 'uncategorized')
90-
setting(:uncategorized_color, 'AB9364');
91-
setting(:uncategorized_text_color, 'FFFFFF');
89+
client_setting(:uncategorized_name, 'uncategorized')
90+
client_setting(:uncategorized_color, 'AB9364');
91+
client_setting(:uncategorized_text_color, 'FFFFFF');
9292

9393
setting(:unique_posts_mins, Rails.env.test? ? 0 : 5)
9494

0 commit comments

Comments
 (0)