You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2016/01/28 08:37:54 UTC
ignite git commit: IGNITE-843 Fixed tables on clusters.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 b5c7b18b1 -> 66db2735d
IGNITE-843 Fixed tables on clusters.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/66db2735
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/66db2735
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/66db2735
Branch: refs/heads/ignite-843-rc2
Commit: 66db2735d79582a3930842d660e31f406ccebc2f
Parents: b5c7b18
Author: Andrey <an...@gridgain.com>
Authored: Thu Jan 28 14:38:42 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Jan 28 14:38:42 2016 +0700
----------------------------------------------------------------------
.../modules/states/configuration/clusters/deployment.jade | 6 +++---
.../configuration/clusters/general/discovery/cloud.jade | 8 ++++----
.../configuration/clusters/general/discovery/multicast.jade | 8 ++++----
.../states/configuration/clusters/general/discovery/vm.jade | 4 ++--
.../js/app/modules/states/configuration/clusters/ssl.jade | 4 ++--
5 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/66db2735/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade
index 489c159..b22eae6 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade
@@ -93,7 +93,7 @@ form.panel.panel-default(name='#{form}' novalidate)
data-ng-disabled='!#{enabled}'
)
.settings-row
- ignite-form-group(ng-init='__ = {}; ___ = {}' ng-model='#{exclude}' name='peerClassLoadingLocalClassPathExclude' )
+ ignite-form-group(ng-init='__ = {};' ng-model='#{exclude}' name='peerClassLoadingLocalClassPathExclude' )
ignite-form-field-label
| Local class path exclude
ignite-form-group-tooltip
@@ -107,7 +107,7 @@ form.panel.panel-default(name='#{form}' novalidate)
- var save = exclude + '[$index] = ' + field
.group-content(ng-if='#{exclude}.length')
- ignite-form-field(ng-repeat='model in #{exclude} track by $index' type='internal' ng-init='')
+ ignite-form-field(ng-repeat='model in #{exclude} track by $index' type='internal' ng-init='___ = {}')
.indexField
| {{ $index+1 }})
i.tipField.fa.fa-remove(
@@ -117,7 +117,7 @@ form.panel.panel-default(name='#{form}' novalidate)
)
span(ng-hide='___.edit')
a.labelFormField(ng-click='#{enabled} && (___.edit = true)') {{ model }}
- span(ng-if='___.edit' ng-form='form' ng-init='#{field} = model')
+ span(ng-if='___.edit' ng-init='#{field} = model')
ignite-form-field-input-text(
data-name='#{field}'
data-ng-model='#{field}'
http://git-wip-us.apache.org/repos/asf/ignite/blob/66db2735/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/cloud.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/cloud.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/cloud.jade
index e27bc8b..82d9c78 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/cloud.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/cloud.jade
@@ -70,7 +70,7 @@ div
data-ng-required='true'
)
.details-row(ng-if='true')
- ignite-form-group(ng-init='__ = {}; ___ = {}' ng-model='#{regions}' name='generalDiscoveryCloudRegions')
+ ignite-form-group(ng-init='__ = {};' ng-model='#{regions}' name='generalDiscoveryCloudRegions')
ignite-form-field-label
| Regions
ignite-form-group-tooltip
@@ -85,7 +85,7 @@ div
- var save = addresses + '[$index] = ' + field
.group-content(ng-if='#{regions}.length')
- ignite-form-field(ng-repeat='model in #{regions} track by $index' type='internal' ng-init='')
+ ignite-form-field(ng-repeat='model in #{regions} track by $index' type='internal' ng-init='___ = {}')
.indexField
| {{ $index+1 }})
i.tipField.fa.fa-remove(
@@ -151,7 +151,7 @@ div
.group-content-empty(ng-if='!(#{regions}.length) && !__.add.length')
| Not defined
.details-row(ng-if='true')
- ignite-form-group(ng-init='__ = {}; ___ = {}' ng-model='#{zones}' name='generalDiscoveryCloudZones')
+ ignite-form-group(ng-init='__ = {};' ng-model='#{zones}' name='generalDiscoveryCloudZones')
ignite-form-field-label
| Zones
ignite-form-group-tooltip
@@ -166,7 +166,7 @@ div
- var save = addresses + '[$index] = ' + field
.group-content(ng-if='#{zones}.length')
- ignite-form-field(ng-repeat='model in #{zones} track by $index' type='internal' ng-init='')
+ ignite-form-field(ng-repeat='model in #{zones} track by $index' type='internal' ng-init='___ = {}')
.indexField
| {{ $index+1 }})
i.tipField.fa.fa-remove(
http://git-wip-us.apache.org/repos/asf/ignite/blob/66db2735/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/multicast.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/multicast.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/multicast.jade
index ef6e0f7..a07aaa6 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/multicast.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/multicast.jade
@@ -83,7 +83,7 @@ div
data-ng-model='#{model}.localAddress'
)
.details-row
- ignite-form-group(ng-init='__ = {}; ___ = {}' ng-model='#{addresses}' name='discoveryMulticastAddresses')
+ ignite-form-group(ng-init='__ = {};' ng-model='#{addresses}' name='discoveryMulticastAddresses')
ignite-form-field-label
| Addresses
ignite-form-group-tooltip
@@ -106,7 +106,7 @@ div
- var save = addresses + '[$index] = ' + field
.group-content(ng-if='#{addresses}.length')
- ignite-form-field(ng-repeat='model in #{addresses} track by $index' type='internal' ng-init='')
+ ignite-form-field(ng-repeat='model in #{addresses} track by $index' type='internal' ng-init=' ___ = {}')
.indexField
| {{ $index+1 }})
i.tipField.fa.fa-remove(
@@ -115,8 +115,8 @@ div
ng-click='#{addresses}.splice(#{addresses}.indexOf(model), 1)'
)
- ignite-form-field-down(ng-if='!$last' data-ng-model='model' data-models='#{addresses}')
- ignite-form-field-up(ng-if='!$first' data-ng-model='model' data-models='#{addresses}')
+ ignite-form-field-down(ng-if='!$last' ng-hide='___.edit' data-ng-model='model' data-models='#{addresses}')
+ ignite-form-field-up(ng-if='!$first' ng-hide='___.edit' data-ng-model='model' data-models='#{addresses}')
span(ng-hide='___.edit')
a.labelFormField(ng-click='___.edit = true') {{ model }}
http://git-wip-us.apache.org/repos/asf/ignite/blob/66db2735/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.jade
index 37121cc..bd28469 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.jade
@@ -19,7 +19,7 @@
- var form = 'general';
div
- ignite-form-group(ng-init='__ = {}; ___ = {}' ng-model='#{addresses}' name='discoveryVmAddresses')
+ ignite-form-group(ng-init='__ = {};' ng-model='#{addresses}' name='discoveryVmAddresses')
ignite-form-field-label
| Addresses
ignite-form-group-tooltip
@@ -42,7 +42,7 @@ div
- var save = addresses + '[$index] = ' + field
.group-content(ng-if='#{addresses}.length')
- ignite-form-field(ng-repeat='model in #{addresses} track by $index' type='internal' ng-init='')
+ ignite-form-field(ng-repeat='model in #{addresses} track by $index' type='internal' ng-init='___ = {}')
.indexField
| {{ $index+1 }})
i.tipField.fa.fa-remove(
http://git-wip-us.apache.org/repos/asf/ignite/blob/66db2735/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/ssl.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/ssl.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/ssl.jade
index af56577..7063a1d 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/ssl.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/ssl.jade
@@ -111,7 +111,7 @@ form.panel.panel-default(name='#{form}' novalidate)
)
.settings-row
- ignite-form-group(ng-init='__ = {}; ___ = {}' name='trustManagers' ng-model='#{trust}')
+ ignite-form-group(ng-init='__ = {};' name='trustManagers' ng-model='#{trust}')
ignite-form-field-label
| Trust managers
ignite-form-group-tooltip
@@ -124,7 +124,7 @@ form.panel.panel-default(name='#{form}' novalidate)
- var save = trust + '[$index] = ' + field
.group-content(ng-if='#{trust}.length')
- ignite-form-field(ng-repeat='model in #{trust} track by $index' type='internal' ng-init='')
+ ignite-form-field(ng-repeat='model in #{trust} track by $index' type='internal' ng-init='___ = {}')
.indexField
| {{ $index+1 }})
i.tipField.fa.fa-remove(