Repository: ignite Updated Branches: refs/heads/ignite-843-rc2 e2fa63493 -> 2df87a87a
IGNITE-843 Clean up. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2df87a87 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2df87a87 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2df87a87 Branch: refs/heads/ignite-843-rc2 Commit: 2df87a87a75d93f14ac6654376b18523163ff4f4 Parents: e2fa634 Author: Andrey <anovi...@gridgain.com> Authored: Mon Dec 21 16:30:25 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Mon Dec 21 16:30:25 2015 +0700 ---------------------------------------------------------------------- .../configuration/summary/summary.controller.js | 5 ++--- .../main/js/views/configuration/summary.jade | 21 +++++++++++--------- 2 files changed, 14 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2df87a87/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js b/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js index f58e95b..0fc6736 100644 --- a/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js +++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js @@ -35,7 +35,6 @@ export default [ $scope.panelExpanded = $common.panelExpanded; $scope.tableVisibleRow = $table.tableVisibleRow; - $scope.joinTip = $common.joinTip; $scope.widthIsSufficient = $common.widthIsSufficient; $scope.tabsServer = { activeTab: 0 }; @@ -65,10 +64,10 @@ export default [ $scope.$watch('cluster', updateTab); - // TODO IGNITE-2114: implemented as indendent logic for download. + // TODO IGNITE-2114: implemented as independent logic for download. $scope.downloadConfiguration = function () { var cluster = $scope.cluster; - var clientNearCfg = $scope.backupItem.nearConfiguration; + var clientNearCfg = cluster.clientNearCfg; var zip = new JSZip(); http://git-wip-us.apache.org/repos/asf/ignite/blob/2df87a87/modules/control-center-web/src/main/js/views/configuration/summary.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/configuration/summary.jade b/modules/control-center-web/src/main/js/views/configuration/summary.jade index e27572d..59f10bf 100644 --- a/modules/control-center-web/src/main/js/views/configuration/summary.jade +++ b/modules/control-center-web/src/main/js/views/configuration/summary.jade @@ -85,12 +85,15 @@ mixin ignite-form-field-tooltip(message) .panel-collapse(id='client' role='tabpanel' bs-collapse-target) form(name='clientForm') + - var nearCfg = 'ctrl.cluster.clientNearCfg' + - var nearCfgEvictionPolicy = nearCfg + '.nearEvictionPolicy[' + nearCfg + '.nearEvictionPolicy.kind]' + .details-row ignite-form-field(data-label='Near cache start size') +ignite-form-field-tooltip("Initial cache size for near cache which will be used to pre-create internal hash table after start") ignite-form-field-input-number( data-name='nearStartSize' - data-ng-model='ctrl.cluster.cfg.nearStartSize' + data-ng-model='#{nearCfg}.nearStartSize' data-placeholder='375000' ) @@ -105,9 +108,9 @@ mixin ignite-form-field-tooltip(message) {value: 'SORTED', label: 'Sorted'},\ {value: undefined, label: 'Not set'}\ ]" - data-ng-model='ctrl.cluster.cfg.nearEvictionPolicy.kind' + data-ng-model='#{nearCfg}.nearEvictionPolicy.kind' ) - span(ng-if='ctrl.cluster.cfg.nearEvictionPolicy.kind') + span(ng-if='#{nearCfg}.nearEvictionPolicy.kind') a.customize( ng-show='ctrl.__form.expanded' ng-click='ctrl.__form.expanded = false' @@ -118,13 +121,13 @@ mixin ignite-form-field-tooltip(message) ) Show settings .details-row - .col-sm-12.panel-details(ng-if='ctrl.__form.expanded && ctrl.cluster.cfg.nearEvictionPolicy.kind') + .col-sm-12.panel-details(ng-if='ctrl.__form.expanded && #{nearCfg}.nearEvictionPolicy.kind') .details-row ignite-form-field(data-label='Batch size') +ignite-form-field-tooltip("Number of entries to remove on shrink") ignite-form-field-input-number( data-name='batchSize' - data-ng-model='ctrl.cluster.cfg.nearEvictionPolicy[ctrl.cluster.cfg.nearEvictionPolicy.kind].batchSize' + data-ng-model='#{nearCfgEvictionPolicy}.batchSize' data-placeholder='1' ) .details-row @@ -132,7 +135,7 @@ mixin ignite-form-field-tooltip(message) +ignite-form-field-tooltip("Maximum allowed cache size in bytes") ignite-form-field-input-number( data-name='maxMemorySize' - data-ng-model='ctrl.cluster.cfg.nearEvictionPolicy[ctrl.cluster.cfg.nearEvictionPolicy.kind].maxMemorySize' + data-ng-model='#{nearCfgEvictionPolicy}.maxMemorySize' data-placeholder='0' ) .details-row @@ -140,15 +143,15 @@ mixin ignite-form-field-tooltip(message) +ignite-form-field-tooltip("Maximum allowed size of cache before entry will start getting evicted") ignite-form-field-input-number( data-name='maxSize' - data-ng-model='ctrl.cluster.cfg.nearEvictionPolicy[ctrl.cluster.cfg.nearEvictionPolicy.kind].maxSize' + data-ng-model='#{nearCfgEvictionPolicy}.maxSize' data-placeholder='100000' ) .summary-tabs(bs-tabs data-bs-active-pane="tabsClient.activeTab" template='configuration/summary-tabs.html') div(bs-pane title='XML') - ignite-ui-ace-xml(data-cluster='cluster' data-cluster-cfg='ctrl.cluster.cfg') + ignite-ui-ace-xml(data-cluster='cluster' data-cluster-cfg='#{nearCfg}') div(bs-pane title='Java') - ignite-ui-ace-java(data-cluster='cluster' data-cluster-cfg='ctrl.cluster.cfg') + ignite-ui-ace-java(data-cluster='cluster' data-cluster-cfg='#{nearCfg}') div(bs-pane title='POM') ignite-ui-ace-pom(data-cluster='cluster') div(bs-pane title='POJO' ng-show='cluster | hasPojo')
