IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2026-08-09 04:28:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Float site settings were marked as overridden, reset didn't work.

Browse Source
This commit is contained in:
Robin Ward
2014-08-20 15:24:56 -04:00
parent d35633deab
commit 33de48dc0c
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/admin/models/site_setting.js
+3 -8
View File
@@ -47,20 +47,15 @@ Discourse.SiteSetting = Discourse.Model.extend({
return this.get('originalValue') !== this.get('value');
}.property('originalValue', 'value'),
/**
Has the setting been overridden from its default value?
@property overridden
**/
overridden: function() {
var val = this.get('value');
var defaultVal = this.get('default');
var val = this.get('value'),
defaultVal = this.get('default');
if (val === null) val = '';
if (defaultVal === null) defaultVal = '';
return val.toString() !== defaultVal.toString();
}.property('value'),
}.property('value', 'default'),
/**
Reset the setting to its original value.