You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/07/15 21:17:10 UTC

[22/45] incubator-ignite git commit: IGNITE-843 WIP on select first.

IGNITE-843 WIP on select first.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c64b19e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c64b19e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c64b19e2

Branch: refs/heads/ignite-1121
Commit: c64b19e281b45385faf8aa2a75a816ec63276cd7
Parents: 78ce2a9
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Jul 14 18:13:20 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Jul 14 18:13:20 2015 +0700

----------------------------------------------------------------------
 .../nodejs/controllers/caches-controller.js     | 39 +++++++++++++-------
 1 file changed, 26 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c64b19e2/modules/web-control-center/nodejs/controllers/caches-controller.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/controllers/caches-controller.js b/modules/web-control-center/nodejs/controllers/caches-controller.js
index 4564596..714ab43 100644
--- a/modules/web-control-center/nodejs/controllers/caches-controller.js
+++ b/modules/web-control-center/nodejs/controllers/caches-controller.js
@@ -85,6 +85,7 @@ controlCenterModule.controller('cachesController', ['$scope', '$http', 'commonFu
                 commonFunctions.showError(errMsg);
             });
 
+        $scope.firstTime = true;
         $scope.caches = [];
 
         $scope.required = function (field) {
@@ -114,23 +115,36 @@ controlCenterModule.controller('cachesController', ['$scope', '$http', 'commonFu
                 $scope.spaces = data.spaces;
                 $scope.caches = data.caches;
 
-                var restoredItem = angular.fromJson(sessionStorage.cacheBackupItem);
+                if ($scope.firstTime) {
+                    console.log("firstTime");
+                    $scope.firstTime = false;
 
-                if (restoredItem && restoredItem._id) {
-                    var idx = _.findIndex($scope.caches, function (cache) {
-                        return cache._id == restoredItem._id;
-                    });
+                    if ($scope.caches.length > 0)
+                        $scope.selectItem($scope.caches[0]);
 
-                    if (idx >= 0) {
-                        $scope.selectedItem = $scope.caches[idx];
-
-                        $scope.backupItem = restoredItem;
+                    sessionStorage.removeItem('cacheBackupItem');
+                }
+                else {
+                    console.log("not firstTime");
+
+                    var restoredItem = angular.fromJson(sessionStorage.cacheBackupItem);
+
+                    if (restoredItem && restoredItem._id) {
+                        var idx = _.findIndex($scope.caches, function (cache) {
+                            return cache._id == restoredItem._id;
+                        });
+
+                        if (idx >= 0) {
+                            $scope.selectedItem = $scope.caches[idx];
+                            $scope.backupItem = restoredItem;
+                        }
+                        else
+                            sessionStorage.removeItem('cacheBackupItem');
                     }
                     else
-                        sessionStorage.removeItem('cacheBackupItem');
+                        $scope.backupItem = restoredItem;
+
                 }
-                else
-                    $scope.backupItem = restoredItem;
 
                 $scope.$watch('backupItem', function (val) {
                     if (val)
@@ -143,7 +157,6 @@ controlCenterModule.controller('cachesController', ['$scope', '$http', 'commonFu
 
         $scope.selectItem = function (item) {
             $scope.selectedItem = item;
-
             $scope.backupItem = angular.copy(item);
         };