Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 0eed2e677 -> b9decf5db
# ignite-850 WIP Discovery details. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b9decf5d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b9decf5d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b9decf5d Branch: refs/heads/ignite-843 Commit: b9decf5db2d60b67f6b002eab27c5ba2d1683bac Parents: 0eed2e6 Author: Andrey <[email protected]> Authored: Tue Jun 9 17:26:19 2015 +0700 Committer: Andrey <[email protected]> Committed: Tue Jun 9 17:26:19 2015 +0700 ---------------------------------------------------------------------- modules/webconfig/nodejs/db.js | 6 ++-- .../public/javascripts/controllers/clusters.js | 31 ++++++++------------ modules/webconfig/nodejs/views/clusters.jade | 8 ++--- 3 files changed, 19 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b9decf5d/modules/webconfig/nodejs/db.js ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/db.js b/modules/webconfig/nodejs/db.js index f38a54f..ac9f147 100644 --- a/modules/webconfig/nodejs/db.js +++ b/modules/webconfig/nodejs/db.js @@ -107,7 +107,7 @@ var ClusterSchema = new Schema({ backups: Number, cacheMode: { type: String, enum: ['LOCAL', 'REPLICATED', 'PARTITIONED'] }, atomicSequenceReserveSize: Number - } + }, caches: [{ type: ObjectId, ref: 'Cache' }], cacheSanityCheckEnabled: Boolean, clockSyncSamples: Number, @@ -141,8 +141,8 @@ var ClusterSchema = new Schema({ managementThreadPoolSize: Number, igfsThreadPoolSize: Number, transactionConfiguration: { - defaultTxConcurrency: { type: String, enum: ['OPTIMISTIC', 'PESSIMISTIC'] } - transactionIsolation: { type: String, enum: ['READ_COMMITTED', 'REPEATABLE_READ', 'SERIALIZABLE'] } + defaultTxConcurrency: { type: String, enum: ['OPTIMISTIC', 'PESSIMISTIC'] }, + transactionIsolation: { type: String, enum: ['READ_COMMITTED', 'REPEATABLE_READ', 'SERIALIZABLE'] }, defaultTxTimeout: Number, pessimisticTxLogLinger: Number, pessimisticTxLogSize: Number, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b9decf5d/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 25b9277..390c38a 100644 --- a/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js +++ b/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js @@ -85,19 +85,6 @@ configuratorModule.controller('clustersController', ['$scope', '$modal', '$http' $scope.advanced = data.advanced; }); - $scope.ss = function (o, s) { - var a = s.split('.'); - - for (var i = 0, n = a.length; i < n; ++i) { - var k = a[i]; - - if (!(k in o)) - o[k] = {}; - - o = o[k]; - } - return o; - }; // Create popup for discovery advanced settings. var discoveryModal = $modal({scope: $scope, template: '/discovery', show: false}); @@ -140,13 +127,17 @@ configuratorModule.controller('clustersController', ['$scope', '$modal', '$http' }); }; - $scope.removeItem = function(item) { - $http.post('/rest/clusters/remove', {_id: item._id}) + $scope.removeItem = function() { + var _id = $scope.selectedItem; + + $http.post('/rest/clusters/remove', {_id: _id}) .success(function() { - var index = $scope.clusters.indexOf(item); + var i = _.findIndex($scope.clusters, function(cluster) { + return cluster._id == _id; + }); - if (index !== -1) { - $scope.clusters.splice(index, 1); + if (i >= 0) { + $scope.clusters.splice(i, 1); if ($scope.selectedItem == item) { $scope.selectedItem = undefined; @@ -161,7 +152,9 @@ configuratorModule.controller('clustersController', ['$scope', '$modal', '$http' }; // Save cluster in db. - $scope.saveItem = function(item) { + $scope.saveItem = function() { + var item = $scope.backupItem; + $http.post('/rest/clusters/save', item) .success(function() { var i = _.findIndex($scope.clusters, function(cluster) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b9decf5d/modules/webconfig/nodejs/views/clusters.jade ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/views/clusters.jade b/modules/webconfig/nodejs/views/clusters.jade index 4b95b5e..31f9db1 100644 --- a/modules/webconfig/nodejs/views/clusters.jade +++ b/modules/webconfig/nodejs/views/clusters.jade @@ -32,9 +32,9 @@ block content button.btn.btn-default(ng-init='create.template = templates[0].value' ng-model='create.template' data-template='/select' data-placeholder='Choose cluster template' bs-options='item.value as item.label for item in templates' bs-select) h3(ng-hide='clusters.length == 0') Clusters .links - table.col-sm-12(st-table='rowCollection' st-safe-src='clusters') + table.col-sm-12(st-table='clusters') tbody - tr(ng-repeat='row in rowCollection') + tr(ng-repeat='row in clusters') td.col-sm-6(ng-class='{active: row._id == selectedItem._id}') a(ng-click='selectItem(row)') {{$index + 1}}. {{row.name}}, {{row.discovery.kind | displayValue:discoveries:'Discovery not set'}} .row.col-sm-12 @@ -54,5 +54,5 @@ block content 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... - button.btn.btn-primary(ng-click='saveItem(backupItem)' ng-disabled='editForm.$invalid') Save - button.btn.btn-primary(ng-click='removeItem(selectedItem)' ng-disabled='editForm.$invalid') Remove \ No newline at end of file + button.btn.btn-primary(ng-click='saveItem()' ng-disabled='editForm.$invalid') Save + button.btn.btn-primary(ng-click='removeItem()' ng-disabled='editForm.$invalid') Remove \ No newline at end of file
