You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2015/05/07 22:28:29 UTC
ambari git commit: AMBARI-10973. Kerberos: "Attention: Some
configurations need your attention" msg in Enable Kerb Wizard hides fields
(rlevas)
Repository: ambari
Updated Branches:
refs/heads/trunk 1f91b67e9 -> 1d618371a
AMBARI-10973. Kerberos: "Attention: Some configurations need your attention" msg in Enable Kerb Wizard hides fields (rlevas)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1d618371
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1d618371
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1d618371
Branch: refs/heads/trunk
Commit: 1d618371a53507a8fb00a5033a4f2038dfe07b87
Parents: 1f91b67
Author: Robert Levas <rl...@hortonworks.com>
Authored: Thu May 7 16:28:12 2015 -0400
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Thu May 7 16:28:12 2015 -0400
----------------------------------------------------------------------
.../app/controllers/wizard/step7_controller.js | 5 +++-
ambari-web/app/messages.js | 1 +
.../common/configs/services_config.hbs | 9 +++++++-
.../test/controllers/wizard/step7_test.js | 24 ++++++++++++++++----
4 files changed, 33 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d618371/ambari-web/app/controllers/wizard/step7_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js
index f2efe68..d62a12f 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -235,6 +235,10 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
}.property('isSubmitDisabled', 'submitButtonClicked', 'filterColumns.@each.selected'),
issuesFilterLinkText: function () {
+ if (this.get('filterColumns').findProperty('attributeName', 'isValid').get('selected')) {
+ return Em.I18n.t('installer.step7.showAllProperties');
+ }
+
return (this.get('isSubmitDisabled') && !this.get('submitButtonClicked')) ?
(
this.get('filterColumns').findProperty('attributeName', 'isValid').get('selected') ?
@@ -1313,5 +1317,4 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
toggleIssuesFilter: function () {
this.get('filterColumns').findProperty('attributeName', 'isValid').toggleProperty('selected');
}
-
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d618371/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index c846e5a..c7693a7 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -733,6 +733,7 @@ Em.I18n.translations = {
'installer.step7.header':'Customize Services',
'installer.step7.body':'We have come up with recommended configurations for the services you selected. Customize them as you see fit.',
'installer.step7.attentionNeeded':'<b>Attention:</b> Some configurations need your attention before you can proceed.',
+ 'installer.step7.noIssues':'All configurations have been addressed.',
'installer.step7.showPropertiesWithIssues':'Show me properties with issues',
'installer.step7.showingPropertiesWithIssues':'Showing properties with issues.',
'installer.step7.showAllProperties':'Show all properties',
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d618371/ambari-web/app/templates/common/configs/services_config.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/services_config.hbs b/ambari-web/app/templates/common/configs/services_config.hbs
index 328a954..bce5082 100644
--- a/ambari-web/app/templates/common/configs/services_config.hbs
+++ b/ambari-web/app/templates/common/configs/services_config.hbs
@@ -46,5 +46,12 @@
{{issuesFilterText}} <a href="#" {{action toggleIssuesFilter target="controller"}}>{{issuesFilterLinkText}}</a>
</div>
{{/unless}}
+ {{else}}
+ {{#unless submitButtonClicked}}
+ <div class="alert alert-success">
+ <span class="icon-check"></span> {{t installer.step7.noIssues}}<br />
+ <a href="#" {{action toggleIssuesFilter target="controller"}}>{{issuesFilterLinkText}}</a>
+ </div>
+ {{/unless}}
{{/if}}
-{{/if}}
\ No newline at end of file
+{{/if}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d618371/ambari-web/test/controllers/wizard/step7_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/wizard/step7_test.js b/ambari-web/test/controllers/wizard/step7_test.js
index 347a859..d81d262 100644
--- a/ambari-web/test/controllers/wizard/step7_test.js
+++ b/ambari-web/test/controllers/wizard/step7_test.js
@@ -29,7 +29,7 @@ var installerStep7Controller,
submitButtonClicked: true,
isIssuesFilterActive: true,
issuesFilterText: '',
- issuesFilterLinkText: '',
+ issuesFilterLinkText: Em.I18n.t('installer.step7.showAllProperties'),
title: 'issues filter on, submit button clicked'
},
{
@@ -61,7 +61,7 @@ var installerStep7Controller,
submitButtonClicked: false,
isIssuesFilterActive: true,
issuesFilterText: '',
- issuesFilterLinkText: '',
+ issuesFilterLinkText: Em.I18n.t('installer.step7.showAllProperties'),
title: 'issues filter on, submit button enabled'
},
{
@@ -71,6 +71,22 @@ var installerStep7Controller,
issuesFilterText: '',
issuesFilterLinkText: '',
title: 'issues filter off, submit button enabled'
+ },
+ {
+ isSubmitDisabled: false,
+ submitButtonClicked: false,
+ isIssuesFilterActive: true,
+ issuesFilterText: '',
+ issuesFilterLinkText: Em.I18n.t('installer.step7.showAllProperties'),
+ title: 'issues filter on, submit button not clicked but active'
+ },
+ {
+ isSubmitDisabled: false,
+ submitButtonClicked: true,
+ isIssuesFilterActive: true,
+ issuesFilterText: '',
+ issuesFilterLinkText: Em.I18n.t('installer.step7.showAllProperties'),
+ title: 'issues filter on, submit button clicked and active'
}
],
issuesFilterTestSetup = function (controller, testCase) {
@@ -487,7 +503,7 @@ describe('App.InstallerStep7Controller', function () {
afterEach(function(){
App.StackService.find.restore();
});
-
+
it('should return serviceConfigTags', function () {
var desired_configs = {
site1: {
@@ -1701,7 +1717,7 @@ describe('App.InstallerStep7Controller', function () {
filename: 'ams-hbase-site.xml'
}
];
-
+
it('should handle properties with the same name', function () {
var services = Em.A([
Em.Object.create({