IGNITE-843 Fixed discovery jcloud ip finder saving regions and zones.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/79c6bfc0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/79c6bfc0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/79c6bfc0 Branch: refs/heads/ignite-843-rc3 Commit: 79c6bfc097d9326d99a196588e6aa73096faa2fe Parents: 6240528 Author: Alexey Kuznetsov <[email protected]> Authored: Tue Feb 9 11:35:56 2016 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Tue Feb 9 11:35:56 2016 +0700 ---------------------------------------------------------------------- .../clusters/general/discovery/cloud.jade | 31 ++++++++++---------- .../main/js/controllers/clusters-controller.js | 2 ++ 2 files changed, 18 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/79c6bfc0/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 bca8c4e..258524f 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 @@ -17,7 +17,8 @@ - var model = 'backupItem.discovery.Cloud'; - var regions = model + '.regions'; - var zones = model + '.zones'; -- var form = 'generalDiscoveryCloudRegions' +- var formRegions = 'discoveryCloudRegions' +- var formZones = 'discoveryCloudZones' div .details-row @@ -70,7 +71,7 @@ div data-ng-required='true' ) .details-row - ignite-form-group(ng-model='#{regions}' ng-form='generalDiscoveryCloudRegions') + ignite-form-group(ng-model='#{regions}' ng-form='#{formRegions}') ignite-form-field-label | Regions ignite-form-group-tooltip @@ -78,11 +79,11 @@ div | If the regions are not set then every region, that a cloud provider has, will be investigated. This could lead to significant performance degradation#[br] | Note, that some cloud providers, like Google Compute Engine, doesn't have a notion of a region. For such providers regions are redundant ignite-form-group-add(ng-click='group.add = [{}]') - | Add new address + | Add new region - var field = 'edit' - - var valid = form + '.' + field + '.$valid' - - var save = addresses + '[$index] = ' + field + - var valid = formRegions + '.' + field + '.$valid' + - var save = regions + '[$index] = ' + field .group-content(ng-if='#{regions}.length') ignite-form-field(ng-repeat='model in #{regions} track by $index' type='internal') @@ -115,13 +116,13 @@ div ) i.fa.fa-exclamation-triangle.form-control-feedback( - ng-show='!#{form}.#{field}.$pristine && #{form}.#{field}.$error.igniteUnique' + ng-show='!#{formRegions}.#{field}.$pristine && #{formRegions}.#{field}.$error.igniteUnique' bs-tooltip data-title='Such region already exists!' ) - var field = 'new' - - var valid = form + '.' + field + '.$valid' + - var valid = formRegions + '.' + field + '.$valid' - var push = regions + '.push(' + field + ')' .group-content(ng-repeat='field in group.add') @@ -145,7 +146,7 @@ div ) i.fa.fa-exclamation-triangle.form-control-feedback( - ng-show='!#{form}.#{field}.$pristine && #{form}.#{field}.$error.igniteUnique' + ng-show='!#{formRegions}.#{field}.$pristine && #{formRegions}.#{field}.$error.igniteUnique' bs-tooltip data-title='Such region already exists!' ) @@ -153,7 +154,7 @@ div .group-content-empty(ng-if='!(#{regions}.length) && !group.add.length') | Not defined .details-row - ignite-form-group(ng-model='#{zones}' ng-form='generalDiscoveryCloudZones') + ignite-form-group(ng-model='#{zones}' ng-form='#{formZones}') ignite-form-field-label | Zones ignite-form-group-tooltip @@ -161,11 +162,11 @@ div | If the zones are not set then every zone from specified regions, will be taken into account#[br] | Note, that some cloud providers, like Rackspace, doesn't have a notion of a zone. For such providers zones are redundant ignite-form-group-add(ng-click='group.add = [{}]') - | Add new address + | Add new zone - var field = 'edit' - - var valid = form + '.' + field + '.$valid' - - var save = addresses + '[$index] = ' + field + - var valid = formZones + '.' + field + '.$valid' + - var save = zones + '[$index] = ' + field .group-content(ng-if='#{zones}.length') ignite-form-field(ng-repeat='model in #{zones} track by $index' type='internal') @@ -198,13 +199,13 @@ div ) i.fa.fa-exclamation-triangle.form-control-feedback( - ng-show='!#{form}.#{field}.$pristine && #{form}.#{field}.$error.igniteUnique' + ng-show='!#{formZones}.#{field}.$pristine && #{formZones}.#{field}.$error.igniteUnique' bs-tooltip data-title='Such zone already exists!' ) - var field = 'new' - - var valid = form + '.' + field + '.$valid' + - var valid = formZones + '.' + field + '.$valid' - var push = zones + '.push(' + field + ')' .group-content(ng-repeat='field in group.add') @@ -228,7 +229,7 @@ div ) i.fa.fa-exclamation-triangle.form-control-feedback( - ng-show='!#{form}.#{field}.$pristine && #{form}.#{field}.$error.igniteUnique' + ng-show='!#{formZones}.#{field}.$pristine && #{formZones}.#{field}.$error.igniteUnique' bs-tooltip data-title='Such zone already exists!' ) http://git-wip-us.apache.org/repos/asf/ignite/blob/79c6bfc0/modules/control-center-web/src/main/js/controllers/clusters-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/clusters-controller.js b/modules/control-center-web/src/main/js/controllers/clusters-controller.js index 6c25e46..a893a42 100644 --- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js +++ b/modules/control-center-web/src/main/js/controllers/clusters-controller.js @@ -238,6 +238,8 @@ consoleModule.controller('clustersController', function ($http, $timeout, $scope // Check cluster logical consistency. function validate(item) { + $common.hidePopover(); + if ($common.isEmptyString(item.name)) return showPopoverMessage($scope.ui, 'general', 'clusterName', 'Name should not be empty');
