Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 a5d52f8ff -> 01c079c9d
# ignite-843 WIP. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b93d9ac0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b93d9ac0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b93d9ac0 Branch: refs/heads/ignite-843 Commit: b93d9ac071db6bac0ecfad964f3d91eff3a98a87 Parents: 2d92879 Author: Andrey <anovi...@gridgain.com> Authored: Tue Jun 2 17:59:22 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Tue Jun 2 17:59:22 2015 +0700 ---------------------------------------------------------------------- .../public/javascripts/controllers/clusters.js | 15 ++++++++++++--- modules/webconfig/nodejs/views/clusters.jade | 19 ++++++++++++++++--- 2 files changed, 28 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b93d9ac0/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js b/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js index da9aac4..84a0864 100644 --- a/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js +++ b/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js @@ -48,7 +48,7 @@ configuratorModule.controller('clustersController', ['$scope', '$modal', '$http' }); $scope.selectItem = function(item) { - $scope.selectedCluster = item; + $scope.selectedItem = item; $scope.backupItem = angular.copy(item); }; @@ -65,6 +65,8 @@ configuratorModule.controller('clustersController', ['$scope', '$modal', '$http' item._id = _id; $scope.clusters.push(item); + + $scope.selectItem(item); }) .error(function(errorMessage) { console.log('Error: ' + errorMessage); @@ -76,8 +78,15 @@ configuratorModule.controller('clustersController', ['$scope', '$modal', '$http' .success(function() { var index = $scope.clusters.indexOf(item); - if (index !== -1) + if (index !== -1) { $scope.clusters.splice(index, 1); + + if ($scope.selectedItem == item) { + $scope.selectedItem = undefined; + + $scope.backupItem = undefined; + } + } }) .error(function(errorMessage) { console.log('Error: ' + errorMessage); @@ -93,7 +102,7 @@ configuratorModule.controller('clustersController', ['$scope', '$modal', '$http' }); if (cluster) - angular.extend(cluster, angular.copy(item)); + angular.extend(cluster, item); }) .error(function(errorMessage) { console.log('Error: ' + errorMessage); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b93d9ac0/modules/webconfig/nodejs/views/clusters.jade ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/views/clusters.jade b/modules/webconfig/nodejs/views/clusters.jade index 4ed67c1..9f91db7 100644 --- a/modules/webconfig/nodejs/views/clusters.jade +++ b/modules/webconfig/nodejs/views/clusters.jade @@ -30,7 +30,7 @@ block content table(st-table='rowCollection' st-safe-src='clusters') tbody tr.col-xs-12(ng-repeat='row in rowCollection') - td.col-xs-12(ng-class="{active: row == selectedCluster}") + td.col-xs-12(ng-class="{active: row == selectedItem}") a(ng-click='selectItem(row)') Name: {{row.name}}, Discovery: {{row.discovery.kind | displayValue:discoveries}} span.pull-right(type='button' ng-click='removeItem(row)') i(class=['fa', 'fa-remove']) @@ -70,11 +70,24 @@ block content .settings-row span.col-xs-2 Peer class loading: .col-xs-4 - input.form-control(type='text' ng-model='backupItem.p2pPoolSize' placeholder='2') + input.form-control(type='text' ng-model='backupItem.igfsPoolSize' placeholder='2') + .settings-row + span.col-xs-2 Igfs: + .col-xs-4 + input.form-control(type='text' ng-model='backupItem.p2pPoolSize' placeholder='availableProcessors') + .settings-row + span.col-xs-2 Utility: + .col-xs-4 + input.form-control(type='text' ng-model='backupItem.utilityCachePoolSize' placeholder='max(8, availableProcessors) * 2') + .settings-row + span.col-xs-2 Marshaller: + .col-xs-4 + input.form-control(type='text' ng-model='backupItem.marshCachePoolSize' placeholder='max(8, availableProcessors) * 2') .panel-heading .panel-title span(bs-collapse-toggle) a(ng-click='expanded = true' ng-hide='expanded') Show advanced settings... a(ng-click='expanded = false' ng-show='expanded') Hide advanced settings... - center + .settings-row + button.btn.btn-primary(ng-click='selectItem(selectedItem)' ng-disabled='editForm.$invalid') Revert button.btn.btn-primary(ng-click='saveItem(backupItem)' ng-disabled='editForm.$invalid') Apply \ No newline at end of file
