ambari git commit: AMBARI-20609. Fix Install Wizard data attribute (onechiporenko)
Repository: ambari Updated Branches: refs/heads/trunk b66d4b17e -> bbd86dd2b AMBARI-20609. Fix Install Wizard data attribute (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bbd86dd2 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bbd86dd2 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bbd86dd2 Branch: refs/heads/trunk Commit: bbd86dd2bf7707485c91461eb118cf808ebef7f8 Parents: b66d4b1 Author: Oleg NechiporenkoAuthored: Fri Apr 21 14:28:03 2017 +0300 Committer: Oleg Nechiporenko Committed: Fri Apr 21 14:33:19 2017 +0300 -- ambari-web/app/templates/wizard/step10.hbs | 2 +- ambari-web/app/templates/wizard/step4.hbs | 4 ++-- ambari-web/app/templates/wizard/step6.hbs | 4 ++-- ambari-web/app/templates/wizard/step7.hbs | 4 ++-- ambari-web/app/templates/wizard/step8.hbs | 4 ++-- ambari-web/app/templates/wizard/step9.hbs | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/bbd86dd2/ambari-web/app/templates/wizard/step10.hbs -- diff --git a/ambari-web/app/templates/wizard/step10.hbs b/ambari-web/app/templates/wizard/step10.hbs index 3c1012e..fef02b4 100644 --- a/ambari-web/app/templates/wizard/step10.hbs +++ b/ambari-web/app/templates/wizard/step10.hbs @@ -56,7 +56,7 @@ - + {{#if App.router.nextBtnClickInProgress}} {{view App.SpinnerView tagName="span" classNames="service-button-spinner"}} {{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/bbd86dd2/ambari-web/app/templates/wizard/step4.hbs -- diff --git a/ambari-web/app/templates/wizard/step4.hbs b/ambari-web/app/templates/wizard/step4.hbs index c688981..9f1d7df 100644 --- a/ambari-web/app/templates/wizard/step4.hbs +++ b/ambari-web/app/templates/wizard/step4.hbs @@ -61,14 +61,14 @@ {{#unless view.parentView.controller.hideBackButton}} - + {{t common.back}} {{#if App.router.backBtnClickInProgress}} {{view App.SpinnerView tagName="span" classNames="service-button-spinner"}} {{/if}} {{/unless}} - + {{#if App.router.nextBtnClickInProgress}} {{view App.SpinnerView tagName="span" classNames="service-button-spinner"}} {{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/bbd86dd2/ambari-web/app/templates/wizard/step6.hbs -- diff --git a/ambari-web/app/templates/wizard/step6.hbs b/ambari-web/app/templates/wizard/step6.hbs index c06177e..6dfb5f1 100644 --- a/ambari-web/app/templates/wizard/step6.hbs +++ b/ambari-web/app/templates/wizard/step6.hbs @@ -95,13 +95,13 @@ - + {{t common.back}} {{#if App.router.backBtnClickInProgress}} {{view App.SpinnerView tagName="span" classNames="service-button-spinner"}} {{/if}} - + {{#if App.router.nextBtnClickInProgress}} {{view App.SpinnerView tagName="span" classNames="service-button-spinner"}} {{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/bbd86dd2/ambari-web/app/templates/wizard/step7.hbs -- diff --git a/ambari-web/app/templates/wizard/step7.hbs b/ambari-web/app/templates/wizard/step7.hbs index aecaf82..206c3cb 100644 --- a/ambari-web/app/templates/wizard/step7.hbs +++ b/ambari-web/app/templates/wizard/step7.hbs @@ -33,7 +33,7 @@ - + {{t common.back}} {{#if App.router.backBtnClickInProgress}} {{view App.SpinnerView tagName="span" classNames="service-button-spinner"}} @@ -43,7 +43,7 @@ {{#if App.supports.preInstallChecks}} {{t installer.step7.preInstallChecks}} {{/if}} - + {{#if App.router.nextBtnClickInProgress}} {{view App.SpinnerView tagName="span" classNames="service-button-spinner"}} {{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/bbd86dd2/ambari-web/app/templates/wizard/step8.hbs -- diff --git a/ambari-web/app/templates/wizard/step8.hbs b/ambari-web/app/templates/wizard/step8.hbs index f0e7b83..ac32710 100644 --- a/ambari-web/app/templates/wizard/step8.hbs +++ b/ambari-web/app/templates/wizard/step8.hbs @@ -84,13 +84,13 @@ - + {{t common.back}} {{#if App.router.backBtnClickInProgress}} {{view App.SpinnerView tagName="span" classNames="service-button-spinner"}} {{/if}} - {{#if
[12/17] ambari git commit: AMBARI-20609. Fix Install Wizard data attribute (onechiporenko)
AMBARI-20609. Fix Install Wizard data attribute (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/daad28f4 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/daad28f4 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/daad28f4 Branch: refs/heads/branch-3.0-perf Commit: daad28f49a7525229e4759bb4e0c3fc6c6c3907d Parents: 72b7842 Author: Oleg NechiporenkoAuthored: Fri Mar 31 11:50:22 2017 +0300 Committer: Andrew Onishuk Committed: Sat Apr 1 10:07:36 2017 +0300 -- ambari-web/app/templates/wizard/step8.hbs | 8 1 file changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/daad28f4/ambari-web/app/templates/wizard/step8.hbs -- diff --git a/ambari-web/app/templates/wizard/step8.hbs b/ambari-web/app/templates/wizard/step8.hbs index 9e50e30..f0e7b83 100644 --- a/ambari-web/app/templates/wizard/step8.hbs +++ b/ambari-web/app/templates/wizard/step8.hbs @@ -27,7 +27,7 @@ - + {{#each item in controller.clusterInfo}} @@ -62,12 +62,12 @@ {{t menu.item.services}}: {{#each controller.services}} - -{{display_name}} + +{{display_name}} {{#each component in this.service_components}} - {{component.display_name }} : {{component.component_value}} + {{component.display_name }} : {{component.component_value}} {{/each}}
ambari git commit: AMBARI-20609. Fix Install Wizard data attribute (onechiporenko)
Repository: ambari Updated Branches: refs/heads/trunk ee24a25d1 -> 388c6c102 AMBARI-20609. Fix Install Wizard data attribute (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/388c6c10 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/388c6c10 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/388c6c10 Branch: refs/heads/trunk Commit: 388c6c102a346b7d0859f9f30fcd3c99164d0a63 Parents: ee24a25 Author: Oleg NechiporenkoAuthored: Fri Mar 31 11:50:22 2017 +0300 Committer: Oleg Nechiporenko Committed: Fri Mar 31 11:50:22 2017 +0300 -- ambari-web/app/templates/wizard/step8.hbs | 8 1 file changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/388c6c10/ambari-web/app/templates/wizard/step8.hbs -- diff --git a/ambari-web/app/templates/wizard/step8.hbs b/ambari-web/app/templates/wizard/step8.hbs index 9e50e30..f0e7b83 100644 --- a/ambari-web/app/templates/wizard/step8.hbs +++ b/ambari-web/app/templates/wizard/step8.hbs @@ -27,7 +27,7 @@ - + {{#each item in controller.clusterInfo}} @@ -62,12 +62,12 @@ {{t menu.item.services}}: {{#each controller.services}} - -{{display_name}} + +{{display_name}} {{#each component in this.service_components}} - {{component.display_name }} : {{component.component_value}} + {{component.display_name }} : {{component.component_value}} {{/each}}
[33/55] [abbrv] ambari git commit: AMBARI-20609. Fix Install Wizard data attribute (onechiporenko)
AMBARI-20609. Fix Install Wizard data attribute (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/27af648e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/27af648e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/27af648e Branch: refs/heads/branch-3.0-perf Commit: 27af648e30affd57191c3fff62760cc0ee9c6ea1 Parents: e808035 Author: Oleg NechiporenkoAuthored: Wed Mar 29 15:59:54 2017 +0300 Committer: Andrew Onishuk Committed: Fri Mar 31 10:21:45 2017 +0300 -- ambari-web/app/assets/index.html| 4 ++-- .../app/controllers/wizard/step6_controller.js | 5 +++- .../mixins/wizard/assign_master_components.js | 1 + ambari-web/app/templates/application.hbs| 4 ++-- .../common/assign_master_components.hbs | 14 ++-- .../app/templates/common/form/dropdown.hbs | 2 +- ambari-web/app/templates/common/modal_popup.hbs | 8 +++ ambari-web/app/templates/installer.hbs | 24 ++-- ambari-web/app/templates/wizard/step6.hbs | 18 +++ .../common/assign_master_components_view.js | 4 ambari-web/app/views/common/modal_popup.js | 1 + .../views/common/modal_popups/alert_popup.js| 1 + .../common/modal_popups/confirmation_popup.js | 1 + ambari-web/app/views/wizard/step6_view.js | 12 ++ 14 files changed, 57 insertions(+), 42 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/27af648e/ambari-web/app/assets/index.html -- diff --git a/ambari-web/app/assets/index.html b/ambari-web/app/assets/index.html index 848df40..efd3c64 100644 --- a/ambari-web/app/assets/index.html +++ b/ambari-web/app/assets/index.html @@ -45,8 +45,8 @@ -http://www.apache.org/licenses/LICENSE-2.0; target="_blank">Licensed under the Apache License, Version 2.0. -See third-party tools/resources that Ambari uses and their respective authors +http://www.apache.org/licenses/LICENSE-2.0; target="_blank">Licensed under the Apache License, Version 2.0. +See third-party tools/resources that Ambari uses and their respective authors http://git-wip-us.apache.org/repos/asf/ambari/blob/27af648e/ambari-web/app/controllers/wizard/step6_controller.js -- diff --git a/ambari-web/app/controllers/wizard/step6_controller.js b/ambari-web/app/controllers/wizard/step6_controller.js index d766c18..fb26dc2 100644 --- a/ambari-web/app/controllers/wizard/step6_controller.js +++ b/ambari-web/app/controllers/wizard/step6_controller.js @@ -163,6 +163,7 @@ App.WizardStep6Controller = Em.Controller.extend(App.HostComponentValidationMixi openSlavesAndClientsIssues: function () { App.ModalPopup.show({ + 'data-qa': 'slave-clients-issues-modal', header: Em.I18n.t('installer.step6.validationSlavesAndClients.popup.header'), bodyClass: Em.View.extend({ controller: this, @@ -405,7 +406,8 @@ App.WizardStep6Controller = Em.Controller.extend(App.HostComponentValidationMixi checked: false, isInstalled: false, isDisabled: header.get('isDisabled'), -uId: _hostName + '-checkbox-' + index +uId: _hostName + '-checkbox-' + index, +dataQaAttr: header.name === 'CLIENT' ? 'client-component' : '' }; }) }; @@ -834,6 +836,7 @@ App.WizardStep6Controller = Em.Controller.extend(App.HostComponentValidationMixi if (self.get('anyWarnings') || self.get('anyErrors')) { App.ModalPopup.show({ +'data-qa': 'validation-issues-modal', primary: Em.I18n.t('common.continueAnyway'), header: Em.I18n.t('installer.step6.validationIssuesAttention.header'), body: Em.I18n.t('installer.step6.validationIssuesAttention'), http://git-wip-us.apache.org/repos/asf/ambari/blob/27af648e/ambari-web/app/mixins/wizard/assign_master_components.js -- diff --git a/ambari-web/app/mixins/wizard/assign_master_components.js b/ambari-web/app/mixins/wizard/assign_master_components.js index 9813da1..3e2a09a 100644 --- a/ambari-web/app/mixins/wizard/assign_master_components.js +++ b/ambari-web/app/mixins/wizard/assign_master_components.js @@ -1205,6 +1205,7 @@ App.AssignMasterComponents = Em.Mixin.create(App.HostComponentValidationMixin, A } App.ModalPopup.show({ + 'data-qa': 'validation-issues-modal', primary: Em.I18n.t('common.continueAnyway'), header:
[44/50] [abbrv] ambari git commit: AMBARI-20609. Fix Install Wizard data attribute (onechiporenko)
AMBARI-20609. Fix Install Wizard data attribute (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4d6c80fe Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4d6c80fe Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4d6c80fe Branch: refs/heads/branch-feature-AMBARI-12556 Commit: 4d6c80febe439377d3753867196b0499d2ed4ba3 Parents: edbb549 Author: Oleg NechiporenkoAuthored: Wed Mar 29 15:59:54 2017 +0300 Committer: Oleg Nechiporenko Committed: Wed Mar 29 15:59:54 2017 +0300 -- ambari-web/app/assets/index.html| 4 ++-- .../app/controllers/wizard/step6_controller.js | 5 +++- .../mixins/wizard/assign_master_components.js | 1 + ambari-web/app/templates/application.hbs| 4 ++-- .../common/assign_master_components.hbs | 14 ++-- .../app/templates/common/form/dropdown.hbs | 2 +- ambari-web/app/templates/common/modal_popup.hbs | 8 +++ ambari-web/app/templates/installer.hbs | 24 ++-- ambari-web/app/templates/wizard/step6.hbs | 18 +++ .../common/assign_master_components_view.js | 4 ambari-web/app/views/common/modal_popup.js | 1 + .../views/common/modal_popups/alert_popup.js| 1 + .../common/modal_popups/confirmation_popup.js | 1 + ambari-web/app/views/wizard/step6_view.js | 12 ++ 14 files changed, 57 insertions(+), 42 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/4d6c80fe/ambari-web/app/assets/index.html -- diff --git a/ambari-web/app/assets/index.html b/ambari-web/app/assets/index.html index 848df40..efd3c64 100644 --- a/ambari-web/app/assets/index.html +++ b/ambari-web/app/assets/index.html @@ -45,8 +45,8 @@ -http://www.apache.org/licenses/LICENSE-2.0; target="_blank">Licensed under the Apache License, Version 2.0. -See third-party tools/resources that Ambari uses and their respective authors +http://www.apache.org/licenses/LICENSE-2.0; target="_blank">Licensed under the Apache License, Version 2.0. +See third-party tools/resources that Ambari uses and their respective authors http://git-wip-us.apache.org/repos/asf/ambari/blob/4d6c80fe/ambari-web/app/controllers/wizard/step6_controller.js -- diff --git a/ambari-web/app/controllers/wizard/step6_controller.js b/ambari-web/app/controllers/wizard/step6_controller.js index d766c18..fb26dc2 100644 --- a/ambari-web/app/controllers/wizard/step6_controller.js +++ b/ambari-web/app/controllers/wizard/step6_controller.js @@ -163,6 +163,7 @@ App.WizardStep6Controller = Em.Controller.extend(App.HostComponentValidationMixi openSlavesAndClientsIssues: function () { App.ModalPopup.show({ + 'data-qa': 'slave-clients-issues-modal', header: Em.I18n.t('installer.step6.validationSlavesAndClients.popup.header'), bodyClass: Em.View.extend({ controller: this, @@ -405,7 +406,8 @@ App.WizardStep6Controller = Em.Controller.extend(App.HostComponentValidationMixi checked: false, isInstalled: false, isDisabled: header.get('isDisabled'), -uId: _hostName + '-checkbox-' + index +uId: _hostName + '-checkbox-' + index, +dataQaAttr: header.name === 'CLIENT' ? 'client-component' : '' }; }) }; @@ -834,6 +836,7 @@ App.WizardStep6Controller = Em.Controller.extend(App.HostComponentValidationMixi if (self.get('anyWarnings') || self.get('anyErrors')) { App.ModalPopup.show({ +'data-qa': 'validation-issues-modal', primary: Em.I18n.t('common.continueAnyway'), header: Em.I18n.t('installer.step6.validationIssuesAttention.header'), body: Em.I18n.t('installer.step6.validationIssuesAttention'), http://git-wip-us.apache.org/repos/asf/ambari/blob/4d6c80fe/ambari-web/app/mixins/wizard/assign_master_components.js -- diff --git a/ambari-web/app/mixins/wizard/assign_master_components.js b/ambari-web/app/mixins/wizard/assign_master_components.js index 9813da1..3e2a09a 100644 --- a/ambari-web/app/mixins/wizard/assign_master_components.js +++ b/ambari-web/app/mixins/wizard/assign_master_components.js @@ -1205,6 +1205,7 @@ App.AssignMasterComponents = Em.Mixin.create(App.HostComponentValidationMixin, A } App.ModalPopup.show({ + 'data-qa': 'validation-issues-modal', primary: Em.I18n.t('common.continueAnyway'), header:
ambari git commit: AMBARI-20609. Fix Install Wizard data attribute (onechiporenko)
Repository: ambari Updated Branches: refs/heads/trunk edbb54920 -> 4d6c80feb AMBARI-20609. Fix Install Wizard data attribute (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4d6c80fe Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4d6c80fe Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4d6c80fe Branch: refs/heads/trunk Commit: 4d6c80febe439377d3753867196b0499d2ed4ba3 Parents: edbb549 Author: Oleg NechiporenkoAuthored: Wed Mar 29 15:59:54 2017 +0300 Committer: Oleg Nechiporenko Committed: Wed Mar 29 15:59:54 2017 +0300 -- ambari-web/app/assets/index.html| 4 ++-- .../app/controllers/wizard/step6_controller.js | 5 +++- .../mixins/wizard/assign_master_components.js | 1 + ambari-web/app/templates/application.hbs| 4 ++-- .../common/assign_master_components.hbs | 14 ++-- .../app/templates/common/form/dropdown.hbs | 2 +- ambari-web/app/templates/common/modal_popup.hbs | 8 +++ ambari-web/app/templates/installer.hbs | 24 ++-- ambari-web/app/templates/wizard/step6.hbs | 18 +++ .../common/assign_master_components_view.js | 4 ambari-web/app/views/common/modal_popup.js | 1 + .../views/common/modal_popups/alert_popup.js| 1 + .../common/modal_popups/confirmation_popup.js | 1 + ambari-web/app/views/wizard/step6_view.js | 12 ++ 14 files changed, 57 insertions(+), 42 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/4d6c80fe/ambari-web/app/assets/index.html -- diff --git a/ambari-web/app/assets/index.html b/ambari-web/app/assets/index.html index 848df40..efd3c64 100644 --- a/ambari-web/app/assets/index.html +++ b/ambari-web/app/assets/index.html @@ -45,8 +45,8 @@ -http://www.apache.org/licenses/LICENSE-2.0; target="_blank">Licensed under the Apache License, Version 2.0. -See third-party tools/resources that Ambari uses and their respective authors +http://www.apache.org/licenses/LICENSE-2.0; target="_blank">Licensed under the Apache License, Version 2.0. +See third-party tools/resources that Ambari uses and their respective authors http://git-wip-us.apache.org/repos/asf/ambari/blob/4d6c80fe/ambari-web/app/controllers/wizard/step6_controller.js -- diff --git a/ambari-web/app/controllers/wizard/step6_controller.js b/ambari-web/app/controllers/wizard/step6_controller.js index d766c18..fb26dc2 100644 --- a/ambari-web/app/controllers/wizard/step6_controller.js +++ b/ambari-web/app/controllers/wizard/step6_controller.js @@ -163,6 +163,7 @@ App.WizardStep6Controller = Em.Controller.extend(App.HostComponentValidationMixi openSlavesAndClientsIssues: function () { App.ModalPopup.show({ + 'data-qa': 'slave-clients-issues-modal', header: Em.I18n.t('installer.step6.validationSlavesAndClients.popup.header'), bodyClass: Em.View.extend({ controller: this, @@ -405,7 +406,8 @@ App.WizardStep6Controller = Em.Controller.extend(App.HostComponentValidationMixi checked: false, isInstalled: false, isDisabled: header.get('isDisabled'), -uId: _hostName + '-checkbox-' + index +uId: _hostName + '-checkbox-' + index, +dataQaAttr: header.name === 'CLIENT' ? 'client-component' : '' }; }) }; @@ -834,6 +836,7 @@ App.WizardStep6Controller = Em.Controller.extend(App.HostComponentValidationMixi if (self.get('anyWarnings') || self.get('anyErrors')) { App.ModalPopup.show({ +'data-qa': 'validation-issues-modal', primary: Em.I18n.t('common.continueAnyway'), header: Em.I18n.t('installer.step6.validationIssuesAttention.header'), body: Em.I18n.t('installer.step6.validationIssuesAttention'), http://git-wip-us.apache.org/repos/asf/ambari/blob/4d6c80fe/ambari-web/app/mixins/wizard/assign_master_components.js -- diff --git a/ambari-web/app/mixins/wizard/assign_master_components.js b/ambari-web/app/mixins/wizard/assign_master_components.js index 9813da1..3e2a09a 100644 --- a/ambari-web/app/mixins/wizard/assign_master_components.js +++ b/ambari-web/app/mixins/wizard/assign_master_components.js @@ -1205,6 +1205,7 @@ App.AssignMasterComponents = Em.Mixin.create(App.HostComponentValidationMixin, A } App.ModalPopup.show({ + 'data-qa': 'validation-issues-modal', primary: