Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/javascripts/admin/models/site_setting.js
View File

@ -47,20 +47,15 @@ Discourse.SiteSetting = Discourse.Model.extend({
return this.get('originalValue') !== this.get('value'); return this.get('originalValue') !== this.get('value');
}.property('originalValue', 'value'), }.property('originalValue', 'value'),
/**
Has the setting been overridden from its default value?
@property overridden
**/
overridden: function() { overridden: function() {
var val = this.get('value'); var val = this.get('value'),
var defaultVal = this.get('default'); defaultVal = this.get('default');
if (val === null) val = ''; if (val === null) val = '';
if (defaultVal === null) defaultVal = ''; if (defaultVal === null) defaultVal = '';
return val.toString() !== defaultVal.toString(); return val.toString() !== defaultVal.toString();
}.property('value'), }.property('value', 'default'),
/** /**
Reset the setting to its original value. Reset the setting to its original value.

4
lib/site_setting_extension.rb
View File

@ -131,7 +131,7 @@ module SiteSettingExtension
opts = { opts = {
setting: s, setting: s,
description: description(s), description: description(s),
default: v, default: v.to_s,
type: type.to_s, type: type.to_s,
value: value.to_s, value: value.to_s,
category: categories[s] category: categories[s]
@ -328,6 +328,8 @@ module SiteSettingExtension
def convert(value, type) def convert(value, type)
case type case type
when types[:float]
value.to_f
when types[:fixnum] when types[:fixnum]
value.to_i value.to_i
when types[:string], types[:list], types[:enum] when types[:string], types[:list], types[:enum]