don't override default thresholds/enable with empty values

nightscout · Aug 9, 2016 · 60e82a0 · 60e82a0
1 parent 62299ae
commit 60e82a0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/lib/client/browser-settings.js b/lib/client/browser-settings.js
@@ -178,8 +178,13 @@ function init (client, plugins, serverSettings, $) {
       return stored !== undefined && stored !== null ? stored : serverSettings.settings[name];
     });
 
-    settings.thresholds = serverSettings.settings.thresholds;
-    settings.enable = serverSettings.settings.enable;
+    if (serverSettings.settings.thresholds) {
+      settings.thresholds = serverSettings.settings.thresholds;
+    }
+
+    if (serverSettings.settings.enable) {
+      settings.enable = serverSettings.settings.enable;
+    }
 
     if (settings.enable.indexOf('ar2') < 0) {
       settings.enable += ' ar2';

diff --git a/static/js/init.js b/static/js/init.js
@@ -6,12 +6,8 @@ serverSettings = {
    'apiEnabled':false,
    'careportalEnabled':false,
    'boluscalcEnabled':false,
-   'settings':{
-     'enable':[],
-     'thresholds':{}
-   },
-   'extendedSettings':{
-   },
+   'settings':{ },
+   'extendedSettings':{ },
    'authorized':null
 };