From ca0a8a5970c93128f643d40acaec9ca33ba4e153 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Thu, 14 Nov 2013 14:46:17 -0500
Subject: [PATCH] Move save and resetDefault actions to the
adminSiteSettingsCategory controller
---
...admin_site_settings_category_controller.js | 36 ++++++++++++++++++-
.../admin_site_settings_controller.js | 36 +------------------
config/locales/client.en.yml | 1 +
config/site_settings.yml | 21 ++++++-----
4 files changed, 49 insertions(+), 45 deletions(-)
diff --git a/app/assets/javascripts/admin/controllers/admin_site_settings_category_controller.js b/app/assets/javascripts/admin/controllers/admin_site_settings_category_controller.js
index 271d26cfd..3c5aac580 100644
--- a/app/assets/javascripts/admin/controllers/admin_site_settings_category_controller.js
+++ b/app/assets/javascripts/admin/controllers/admin_site_settings_category_controller.js
@@ -14,6 +14,40 @@ Discourse.AdminSiteSettingsCategoryController = Ember.ObjectController.extend({
} else {
return Em.A();
}
- }.property('controllers.adminSiteSettings.content', 'categoryNameKey')
+ }.property('controllers.adminSiteSettings.content', 'categoryNameKey'),
+
+ actions: {
+
+ /**
+ Reset a setting to its default value
+
+ @method resetDefault
+ @param {Discourse.SiteSetting} setting The setting we want to revert
+ **/
+ resetDefault: function(setting) {
+ setting.set('value', setting.get('default'));
+ setting.save();
+ },
+
+ /**
+ Save changes to a site setting
+
+ @method save
+ @param {Discourse.SiteSetting} setting The setting we've changed
+ **/
+ save: function(setting) {
+ setting.save();
+ },
+
+ /**
+ Cancel changes to a site setting
+
+ @method cancel
+ @param {Discourse.SiteSetting} setting The setting we've changed but want to revert
+ **/
+ cancel: function(setting) {
+ setting.resetValue();
+ }
+ }
});
diff --git a/app/assets/javascripts/admin/controllers/admin_site_settings_controller.js b/app/assets/javascripts/admin/controllers/admin_site_settings_controller.js
index d5d3a963d..745772514 100644
--- a/app/assets/javascripts/admin/controllers/admin_site_settings_controller.js
+++ b/app/assets/javascripts/admin/controllers/admin_site_settings_controller.js
@@ -55,40 +55,6 @@ Discourse.AdminSiteSettingsController = Ember.ArrayController.extend(Discourse.P
});
this.set('model', matchesGroupedByCategory);
- }.observes('filter', 'onlyOverridden'),
-
- actions: {
-
- /**
- Reset a setting to its default value
-
- @method resetDefault
- @param {Discourse.SiteSetting} setting The setting we want to revert
- **/
- resetDefault: function(setting) {
- setting.set('value', setting.get('default'));
- setting.save();
- },
-
- /**
- Save changes to a site setting
-
- @method save
- @param {Discourse.SiteSetting} setting The setting we've changed
- **/
- save: function(setting) {
- setting.save();
- },
-
- /**
- Cancel changes to a site setting
-
- @method cancel
- @param {Discourse.SiteSetting} setting The setting we've changed but want to revert
- **/
- cancel: function(setting) {
- setting.resetValue();
- }
- }
+ }.observes('filter', 'onlyOverridden')
});
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 89c1c60d5..74eecdae5 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1426,4 +1426,5 @@ en:
trust: 'Trust Levels'
spam: 'Spam'
rate_limits: 'Rate Limits'
+ developer: 'Developer'
uncategorized: 'Uncategorized'
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 17fabb30c..83a143748 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -259,6 +259,16 @@ rate_limits:
max_edits_per_day: 30
max_favorites_per_day: 20
+developer:
+ force_hostname: ''
+ port:
+ default:
+ development: 3000
+ default: ''
+ queue_jobs:
+ default:
+ test: false
+ default: true
uncategorized:
tos_url:
@@ -323,16 +333,9 @@ uncategorized:
auto_track_topics_after: 240000
new_topic_duration_minutes: 2880
long_polling_interval: 15000
- force_hostname: ''
- port:
- default:
- development: 3000
- default: ''
+
use_ssl: false
- queue_jobs:
- default:
- test: false
- default: true
+
category_featured_topics:
client: true