ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [1/2] ignite git commit: IGNITE-2280 Use first cluster by default on cache/igfs/gg create new item.
Date Tue, 29 Dec 2015 04:11:24 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 2dc4d2034 -> 50a019bd7


IGNITE-2280 Use first cluster by default on cache/igfs/gg create new item.


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

Branch: refs/heads/ignite-843-rc2
Commit: 17c8e8bded7c7d6ad77ef7c6b2b7aa8783f1cca8
Parents: 2dc4d20
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Tue Dec 29 11:10:02 2015 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Tue Dec 29 11:10:02 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/caches-controller.js              | 7 ++++++-
 .../src/main/js/controllers/igfs-controller.js                | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/17c8e8bd/modules/control-center-web/src/main/js/controllers/caches-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/caches-controller.js b/modules/control-center-web/src/main/js/controllers/caches-controller.js
index 5ab3a19..4d6ec0a 100644
--- a/modules/control-center-web/src/main/js/controllers/caches-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/caches-controller.js
@@ -483,7 +483,12 @@ consoleModule.controller('cachesController', [
                         $common.ensureActivePanel($scope.panels, 'general', 'cacheName');
                     });
 
-                    $scope.selectItem(undefined, prepareNewItem(id));
+                    var newItem = prepareNewItem(id);
+
+                    if ($common.isEmptyArray(newItem.clusters) && !$common.isEmptyArray($scope.clusters))
+                        newItem.clusters.push($scope.clusters[0].value);
+
+                    $scope.selectItem(undefined, newItem);
                 }
             };
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/17c8e8bd/modules/control-center-web/src/main/js/controllers/igfs-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/igfs-controller.js b/modules/control-center-web/src/main/js/controllers/igfs-controller.js
index be9344d..8ddc932 100644
--- a/modules/control-center-web/src/main/js/controllers/igfs-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/igfs-controller.js
@@ -299,7 +299,12 @@ consoleModule.controller('igfsController', [
                         $common.ensureActivePanel($scope.panels, 'general', 'igfsName');
                     });
 
-                    $scope.selectItem(undefined, prepareNewItem(id));
+                    var newItem = prepareNewItem(id);
+
+                    if ($common.isEmptyArray(newItem.clusters) && !$common.isEmptyArray($scope.clusters))
+                        newItem.clusters.push($scope.clusters[0].value);
+
+                    $scope.selectItem(undefined, newItem);
                 }
             };
 


Mime
View raw message