You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2017/10/02 18:48:05 UTC
ambari git commit: AMBARI-22111. UI displays Patch version even after
full stack upgrade (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.6 e58ceff72 -> 4de5cb22b
AMBARI-22111. UI displays Patch version even after full stack upgrade (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4de5cb22
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4de5cb22
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4de5cb22
Branch: refs/heads/branch-2.6
Commit: 4de5cb22b411e7aaa3fa46a9a2cc21ec0445c3d8
Parents: e58ceff
Author: Alex Antonenko <aa...@hortonworks.com>
Authored: Mon Oct 2 21:47:47 2017 +0300
Committer: Alex Antonenko <aa...@hortonworks.com>
Committed: Mon Oct 2 21:47:47 2017 +0300
----------------------------------------------------------------------
.../admin/stack_upgrade/upgrade_version_column.hbs | 8 ++++++++
.../admin/stack_upgrade/upgrade_version_box_view.js | 14 ++++++++++----
.../stack_upgrade/upgrade_version_box_view_test.js | 4 ++--
3 files changed, 20 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4de5cb22/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
index 6dddfde..dc7b712 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
@@ -38,6 +38,7 @@
<button class="btn btn-primary"
{{action runAction target="view"}}
{{bindAttr disabled="view.stateElement.isDisabled"}}>
+ <i {{bindAttr class="view.stateElement.iconClass"}}></i>
{{view.stateElement.text}}
</button>
<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown" {{bindAttr disabled="view.stateElement.isDisabled"}}>
@@ -82,6 +83,13 @@
</button>
<ul class="dropdown-menu">
<li><a {{action confirmRevertPatchUpgrade view.content target="controller"}}>{{t common.revert}}</a></li>
+ {{#each button in view.stateElement.buttons}}
+ <li {{bindAttr class="button.isDisabled:disabled"}}>
+ <a {{action runAction button.action target="view"}}>
+ {{button.text}}
+ </a>
+ </li>
+ {{/each}}
</ul>
</div>
{{/if}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/4de5cb22/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
index 0e71fa6..478669c 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
@@ -134,7 +134,7 @@ App.UpgradeVersionBoxView = Em.View.extend({
},
'INSTALLED': {
iconClass: 'icon-ok',
- isLink: true,
+ isButtonGroup: true,
text: Em.I18n.t('common.installed'),
action: null
},
@@ -254,9 +254,8 @@ App.UpgradeVersionBoxView = Em.View.extend({
this.get('content.repositoryVersion'),
Em.get(currentVersion, 'repository_version')
) === 1;
-
+ var isDisabled = this.isDisabledOnInstalled();
if (Em.get(currentVersion, 'stack_name') !== this.get('content.stackVersionType') || isVersionHigherThanCurrent) {
- var isDisabled = this.isDisabledOnInstalled();
switch (status){
case 'OUT_OF_SYNC':
element.set('isButtonGroup', true);
@@ -290,7 +289,7 @@ App.UpgradeVersionBoxView = Em.View.extend({
isDisabled: isDisabled
});
- if (this.get('content.isPatch')) {
+ if (this.get('content.isPatch') || this.get('content.isMaint')) {
element.get('buttons').pushObject({
text: Em.I18n.t('common.hide'),
action: 'confirmDiscardRepoVersion',
@@ -303,6 +302,13 @@ App.UpgradeVersionBoxView = Em.View.extend({
}
else {
element.setProperties(this.get('statePropertiesMap')['INSTALLED']);
+ if (this.get('content.isPatch') || this.get('content.isMaint')) {
+ element.get('buttons').pushObject({
+ text: Em.I18n.t('common.hide'),
+ action: 'confirmDiscardRepoVersion',
+ isDisabled: isDisabled
+ });
+ }
}
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/4de5cb22/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
index 2f9f76e..30cfa10 100644
--- a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
+++ b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
@@ -606,7 +606,7 @@ describe('App.UpgradeVersionBoxView', function () {
},
expected: {
status: 'INSTALLED',
- isLink: true,
+ isButtonGroup: true,
iconClass: 'icon-ok',
text: Em.I18n.t('common.installed'),
action: null
@@ -1347,7 +1347,7 @@ describe('App.UpgradeVersionBoxView', function () {
expect(element).to.be.eql(Em.Object.create({
"action": null,
"iconClass": "icon-ok",
- "isLink": true,
+ "isButtonGroup": true,
"text": "Installed"
}));
});