Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 c081aed03 -> 1877a5532
# IGNITE-843 Minor fixes, min/max, save alert. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1877a553 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1877a553 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1877a553 Branch: refs/heads/ignite-843 Commit: 1877a5532b3f004a629da61a96b1522d27351ee0 Parents: c081aed Author: AKuznetsov <akuznet...@gridgain.com> Authored: Fri Jun 26 10:46:46 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Fri Jun 26 10:46:46 2015 +0700 ---------------------------------------------------------------------- .../nodejs/public/form-models/caches.json | 23 ++++++++++---------- .../nodejs/public/form-models/clusters.json | 2 ++ .../nodejs/public/form-models/persistence.json | 1 + .../public/javascripts/controllers/caches.js | 2 ++ .../public/javascripts/controllers/clusters.js | 2 ++ modules/webconfig/nodejs/views/caches.jade | 2 +- modules/webconfig/nodejs/views/clusters.jade | 4 ++-- 7 files changed, 22 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1877a553/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 d448a77..102fae4 100644 --- a/modules/webconfig/nodejs/public/form-models/caches.json +++ b/modules/webconfig/nodejs/public/form-models/caches.json @@ -74,6 +74,7 @@ "label": "Off-heap max memory", "type": "number", "model": "offHeapMaxMemory", + "min": -1, "placeholder": "-1", "tip": [ "Sets maximum amount of memory available to off-heap storage.", @@ -86,14 +87,6 @@ ] }, { - "label": "Swap enabled", - "type": "check", - "model": "swapEnabled", - "tip": [ - "Flag indicating whether swap storage is enabled or not for this cache." - ] - }, - { "label": "Eviction policy", "type": "dropdown-details", "group": "evictionPolicy", @@ -206,6 +199,14 @@ ] } } + }, + { + "label": "Swap enabled", + "type": "check", + "model": "swapEnabled", + "tip": [ + "Flag indicating whether swap storage is enabled or not for this cache." + ] } ] }, @@ -401,8 +402,8 @@ "Rebalance modes:", "<ul>", " <li>Synchronous - in this mode distributed caches will not start until all necessary data is loaded from other available grid nodes.</li>", - " <li>Asynchronous - in this mode entries never end up in heap memory and get stored in offheap memory right away.</li>", - " <li>None - in this mode entry keys will be stored on heap memory, and values will be stored in offheap memory.</li>", + " <li>Asynchronous - in this mode distributed caches will start immediately and will load all necessary data from other available grid nodes in the background.</li>", + " <li>None - in this mode no rebalancing will take place which means that caches will be either loaded on demand from persistent store whenever data is accessed, or will be populated explicitly.</li>", "</ul>" ] }, @@ -645,7 +646,7 @@ "label": "Default lock timeout", "type": "number", "model": "defaultLockTimeout", - "placeholder": "1", + "placeholder": "0", "tip": [ "Default lock acquisition timeout.", "If 0 then lock acquisition will never timeout." http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1877a553/modules/webconfig/nodejs/public/form-models/clusters.json ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/public/form-models/clusters.json b/modules/webconfig/nodejs/public/form-models/clusters.json index 3c3b6cb..03d7d3e 100644 --- a/modules/webconfig/nodejs/public/form-models/clusters.json +++ b/modules/webconfig/nodejs/public/form-models/clusters.json @@ -88,6 +88,7 @@ "label": "Port number", "type": "number", "model": "multicastPort", + "max": 65535, "placeholder": "47400", "tip": [ "Port number which multicast messages are sent to." @@ -644,6 +645,7 @@ "label": "Port base", "type": "number", "model": "timeServerPortBase", + "max": 65535, "placeholder": "31100", "tip": [ "Time server provides clock synchronization between nodes.", http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1877a553/modules/webconfig/nodejs/public/form-models/persistence.json ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/public/form-models/persistence.json b/modules/webconfig/nodejs/public/form-models/persistence.json index 2b15d44..69ca679 100644 --- a/modules/webconfig/nodejs/public/form-models/persistence.json +++ b/modules/webconfig/nodejs/public/form-models/persistence.json @@ -29,6 +29,7 @@ "label": "Port", "type": "number", "model": "port", + "max": 65535, "placeholder": "", "tip": [ "Port number for connecting to database." http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1877a553/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 1f18e38..264ac47 100644 --- a/modules/webconfig/nodejs/public/javascripts/controllers/caches.js +++ b/modules/webconfig/nodejs/public/javascripts/controllers/caches.js @@ -128,6 +128,8 @@ configuratorModule.controller('cachesController', ['$scope', '$alert', '$http', } $scope.selectItem(item); + + $alert({type: "success", title: 'Cache saved.', duration: 1, placement: "top", container: '#save-btn'}); }) .error(function (errorMessage) { $alert({title: errorMessage}); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1877a553/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 16f9945..fd2b976 100644 --- a/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js +++ b/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js @@ -141,6 +141,8 @@ configuratorModule.controller('clustersController', ['$scope', '$alert', '$http' } $scope.selectItem(item); + + $alert({type: "success", title: 'Cluster saved.', duration: 1, placement: "top", container: '#save-btn'}); }) .error(function(errorMessage) { $alert({title: errorMessage}); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1877a553/modules/webconfig/nodejs/views/caches.jade ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/views/caches.jade b/modules/webconfig/nodejs/views/caches.jade index 122db34..16ac583 100644 --- a/modules/webconfig/nodejs/views/caches.jade +++ b/modules/webconfig/nodejs/views/caches.jade @@ -62,5 +62,5 @@ block content .panel-title h3 a(bs-collapse-toggle='0' ng-click='expanded = !expanded;') {{expanded ? 'Hide advanced settings...' : 'Show advanced settings...'}} - button.btn.btn-primary(ng-disabled='inputForm.$invalid' ng-click='saveItem()') Save + button#save-btn.btn.btn-primary(ng-disabled='inputForm.$invalid' ng-click='saveItem()') Save button.btn.btn-primary.btn-second(ng-show='backupItem._id' ng-click='removeItem()') Remove http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1877a553/modules/webconfig/nodejs/views/clusters.jade ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/views/clusters.jade b/modules/webconfig/nodejs/views/clusters.jade index 2f5bce0..9856838 100644 --- a/modules/webconfig/nodejs/views/clusters.jade +++ b/modules/webconfig/nodejs/views/clusters.jade @@ -34,7 +34,7 @@ block content 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'}} button.btn.btn-primary(ng-click='createItem()' ng-disabled='!create.template')  Add cluster - span(style='margin-left: 15px; margin-right: 5px') Use template:  + label(style='margin-left: 15px; margin-right: 10px') Use template: 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) i.tiplabel.fa.fa-question-circle(bs-tooltip data-title='{{joinTip(templateTip)}}' type='button') hr @@ -65,5 +65,5 @@ block content .panel-title h3 a(bs-collapse-toggle='0' ng-click='expanded = !expanded;') {{expanded ? 'Hide advanced settings...' : 'Show advanced settings...'}} - button.btn.btn-primary(ng-disabled='inputForm.$invalid' ng-click='saveItem()') Save + button#save-btn.btn.btn-primary(ng-disabled='inputForm.$invalid' ng-click='saveItem()') Save button.btn.btn-primary(ng-show='backupItem._id' ng-click='removeItem()') Remove \ No newline at end of file
