Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 712396e27 -> 7aab34108
# IGNITE-843 WIP on caches screen. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7aab3410 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7aab3410 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7aab3410 Branch: refs/heads/ignite-843 Commit: 7aab34108ebe8cb6700b2563e1047aaa839f45e1 Parents: 712396e Author: AKuznetsov <akuznet...@gridgain.com> Authored: Fri Jun 5 13:55:14 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Fri Jun 5 13:55:14 2015 +0700 ---------------------------------------------------------------------- modules/webconfig/nodejs/public/form-models/caches.json | 10 ++++++++++ .../nodejs/public/javascripts/controllers/caches.js | 11 ++++------- modules/webconfig/nodejs/views/caches.jade | 5 +++++ modules/webconfig/nodejs/views/includes/controls.jade | 2 +- 4 files changed, 20 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7aab3410/modules/webconfig/nodejs/public/form-models/caches.json ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/public/form-models/caches.json b/modules/webconfig/nodejs/public/form-models/caches.json index 551213e..d5aa479 100644 --- a/modules/webconfig/nodejs/public/form-models/caches.json +++ b/modules/webconfig/nodejs/public/form-models/caches.json @@ -205,6 +205,16 @@ ] } ] + }, + { + "label": "Query", + "fields": [ + { + "type": "idxTypes", + "model": "idxTypes", + "tip": ["Collection of types to index"] + } + ] } ] } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7aab3410/modules/webconfig/nodejs/public/javascripts/controllers/caches.js ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/public/javascripts/controllers/caches.js b/modules/webconfig/nodejs/public/javascripts/controllers/caches.js index d902e9a..57824d8 100644 --- a/modules/webconfig/nodejs/public/javascripts/controllers/caches.js +++ b/modules/webconfig/nodejs/public/javascripts/controllers/caches.js @@ -17,8 +17,8 @@ configuratorModule.controller('cachesController', ['$scope', '$http', function($scope, $http) { $scope.templates = [ - {value: {mode: 'PART', atomicity: 'TRANSACTIONAL'}, label: 'Partitioned'}, - {value: {mode: 'REPL', atomicity: 'ATOMIC'}, label: 'Replicated'}, + {value: {mode: 'PARTITIONED', atomicity: 'TRANSACTIONAL'}, label: 'Partitioned'}, + {value: {mode: 'REPLICATED', atomicity: 'ATOMIC'}, label: 'Replicated'}, {value: {mode: 'LOCAL', atomicity: 'ATOMIC'}, label: 'Local'} ]; @@ -28,8 +28,8 @@ configuratorModule.controller('cachesController', ['$scope', '$http', function($ ]; $scope.modes = [ - {value: 'PART', label: 'Partitioned'}, - {value: 'REPL', label: 'Replicated'}, + {value: 'PARTITIONED', label: 'Partitioned'}, + {value: 'REPLICATED', label: 'Replicated'}, {value: 'LOCAL', label: 'Local'} ]; @@ -53,8 +53,6 @@ configuratorModule.controller('cachesController', ['$scope', '$http', function($ $scope.general = []; $scope.advanced = []; - - $http.get('/form-models/caches.json') .success(function(data) { $scope.general = data.general; @@ -89,7 +87,6 @@ configuratorModule.controller('cachesController', ['$scope', '$http', function($ item.name = 'Cache ' + ($scope.caches.length + 1); item.space = $scope.spaces[0]._id; - $http.post('/rest/caches/save', item) .success(function(_id) { item._id = _id; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7aab3410/modules/webconfig/nodejs/views/caches.jade ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/views/caches.jade b/modules/webconfig/nodejs/views/caches.jade index 9784cf3..24765f7 100644 --- a/modules/webconfig/nodejs/views/caches.jade +++ b/modules/webconfig/nodejs/views/caches.jade @@ -51,6 +51,11 @@ block content .settings-row(ng-repeat='field in group.fields') div(ng-switch on='field.type') +form-row + div(ng-switch-when='idxTypes') + .panel + label.col-sm-2 Key class + label.col-sm-2 Val class + +tip .panel-heading .panel-title span(bs-collapse-toggle) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7aab3410/modules/webconfig/nodejs/views/includes/controls.jade ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/views/includes/controls.jade b/modules/webconfig/nodejs/views/includes/controls.jade index f173781..f6a5fcc 100644 --- a/modules/webconfig/nodejs/views/includes/controls.jade +++ b/modules/webconfig/nodejs/views/includes/controls.jade @@ -36,4 +36,4 @@ mixin form-row label.col-sm-2 {{field.label}}: .col-sm-3 button.form-control(bs-select ng-model='backupItem[field.model]' data-multiple='1' data-template='/select' data-placeholder='{{field.placeholder}}' bs-options='item.value as item.label for item in {{field.items}}') - +tip \ No newline at end of file + +tip
