fix(Chart): Fix saving of default persistence service

Signed-off-by: Chris Jackson <chris@cd-jackson.com>
openhab · Jun 5, 2016 · 8b45270 · 8b45270
1 parent 326927a
commit 8b45270
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 9 deletions.
diff --git a/output/org.openhab.ui.habmin_2.0.0.SNAPSHOT-0.1.6.jar b/output/org.openhab.ui.habmin_2.0.0.SNAPSHOT-0.1.6.jar
diff --git a/src/app/chart/chart.js b/src/app/chart/chart.js
@@ -311,7 +311,7 @@ angular.module('HABmin.chart', [
         $scope.tooltipSave = locale.getString('chart.SaveChart');
         $scope.tooltipDelete = locale.getString('chart.DeleteChart');
 
-        if(ChartService.service == null || ChartService.service.length == 0) {
+        if (ChartService.service == null || ChartService.service.length == 0) {
             ChartService.service = UserService.getPersistence();
         }
 
@@ -320,13 +320,23 @@ angular.module('HABmin.chart', [
             function (data) {
                 $scope.services = data;
                 if ($scope.services.length > 0) {
-                    $scope.services[0].selected = true;
+                    // Check that the default service exists
+                    if (ChartService.service != null) {
+                        var found = false;
+                        for (var service in $scope.services) {
+                            if ($scope.services[service].name == ChartService.service) {
+                                found = true;
+                                break;
+                            }
+                        }
 
-                    // Use the first service as the default if there isn't a default set
-                    if(ChartService.service != null) {
-                        return;
+                        if (found == true) {
+                            return;
+                        }
                     }
 
+                    // Use the first service as the default if there isn't a default set
+                    $scope.services[0].selected = true;
                     ChartService.service = $scope.services[0].name;
                 }
             },

diff --git a/src/app/user/userConfig.js b/src/app/user/userConfig.js
@@ -47,7 +47,7 @@ angular.module('User.Config', [
 
         $scope.model = {
             currentLanguage: UserService.getLanguage(),
-            currentPersistence: UserService.getPersistence(),
+            currentPersistence: "",
             serverAddress: UserService.getServer()
         };
         $scope.languages = [];
@@ -73,9 +73,15 @@ angular.module('User.Config', [
         PersistenceServiceModel.getList().then(
             function (data) {
                 $scope.services = data;
-                if ($scope.services.length > 0) {
-                    $scope.services[0].selected = true;
-                    ChartService.service = $scope.services[0].name;
+//                if ($scope.services.length > 0) {
+//                    $scope.services[0].selected = true;
+//                    ChartService.service = $scope.services[0].name;
+//                }
+                // Find the default service
+                for (var service in $scope.services) {
+                    if ($scope.services[service].name == UserService.getPersistence()) {
+                        $scope.model.currentPersistence = $scope.services[service];
+                    }
                 }
             },
             function (reason) {