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-1200 Fixed selection of cluster on IGFS page.
Date Tue, 03 Nov 2015 10:25:45 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc1 526f2be32 -> 1d8003557


IGNITE-1200 Fixed selection of cluster on IGFS page.


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

Branch: refs/heads/ignite-843-rc1
Commit: 9cf7a8a5c782f4d74e8b60858cbb94a0849b17bc
Parents: 526f2be
Author: vsisko <vsisko@gridgain.com>
Authored: Tue Nov 3 17:11:04 2015 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Tue Nov 3 17:11:04 2015 +0700

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


http://git-wip-us.apache.org/repos/asf/ignite/blob/9cf7a8a5/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 624f6f0..40bf1f8 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
@@ -273,7 +273,6 @@ consoleModule.controller('cachesController', [
 
                                         selectFirstItem();
                                     }
-
                                 }
                                 else
                                     selectFirstItem();

http://git-wip-us.apache.org/repos/asf/ignite/blob/9cf7a8a5/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 c96616c..ab8af07 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
@@ -136,7 +136,7 @@ consoleModule.controller('igfsController', [
                             $scope.ui.addGroups(data.general, data.advanced);
 
                             if ($common.getQueryVariable('new'))
-                                $scope.createItem();
+                                $scope.createItem($common.getQueryVariable('id'));
                             else {
                                 var lastSelectedIgfs = angular.fromJson(sessionStorage.lastSelectedIgfs);
 
@@ -232,23 +232,24 @@ consoleModule.controller('igfsController', [
                     'Selected IGFS: ' + $scope.backupItem.name : 'New IGFS';
             };
 
-            function prepareNewItem() {
+            function prepareNewItem(id) {
                 return {
                     space: $scope.spaces[0]._id,
                     ipcEndpointEnabled: true,
-                    fragmentizerEnabled: true
+                    fragmentizerEnabled: true,
+                    clusters: id && _.find($scope.clusters, {value: id}) ? [id] :
[]
                 }
             }
 
             // Add new IGFS.
-            $scope.createItem = function () {
+            $scope.createItem = function (id) {
                 $table.tableReset();
 
                 $timeout(function () {
                     $common.ensureActivePanel($scope.panels, 'general', 'igfsName');
                 });
 
-                $scope.selectItem(undefined, prepareNewItem());
+                $scope.selectItem(undefined, prepareNewItem(id));
             };
 
             // Check IGFS logical consistency.


Mime
View raw message