You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2015/02/13 12:26:59 UTC
ambari git commit: AMBARI-9598 RU. Invalid tooltips on the Version
Box. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk 91357d07f -> 63c683f32
AMBARI-9598 RU. Invalid tooltips on the Version Box. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/63c683f3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/63c683f3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/63c683f3
Branch: refs/heads/trunk
Commit: 63c683f3272e5c5ef294b43f1157cb49a8bd4e58
Parents: 91357d0
Author: Andrii Tkach <at...@hortonworks.com>
Authored: Thu Feb 12 16:36:39 2015 +0200
Committer: Andrii Tkach <at...@hortonworks.com>
Committed: Fri Feb 13 13:21:08 2015 +0200
----------------------------------------------------------------------
.../models/stack_version/repository_version.js | 21 ++++++++++++++++++++
.../admin/stack_upgrade/upgrade_version_box.hbs | 12 +++++------
.../stack_upgrade/upgrade_version_box_view.js | 10 ++++++----
.../upgrade_version_box_view_test.js | 15 ++++++++++----
4 files changed, 44 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/63c683f3/ambari-web/app/models/stack_version/repository_version.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/stack_version/repository_version.js b/ambari-web/app/models/stack_version/repository_version.js
index c5a45a3..01806cb 100644
--- a/ambari-web/app/models/stack_version/repository_version.js
+++ b/ambari-web/app/models/stack_version/repository_version.js
@@ -86,6 +86,27 @@ App.RepositoryVersion = DS.Model.extend({
}.property('stackVersion.noInitHosts'),
/**
+ * @type {string}
+ */
+ noInitHostsTooltip: function () {
+ return (this.get('noInitHosts')) ? Em.I18n.t('admin.stackVersions.version.emptyHostsTooltip') : Em.I18n.t('admin.stackVersions.version.hostsTooltip');
+ }.property('noInitHosts'),
+
+ /**
+ * @type {string}
+ */
+ noCurrentHostsTooltip: function () {
+ return (this.get('noCurrentHosts')) ? Em.I18n.t('admin.stackVersions.version.emptyHostsTooltip') : Em.I18n.t('admin.stackVersions.version.hostsTooltip');
+ }.property('noCurrentHosts'),
+
+ /**
+ * @type {string}
+ */
+ noInstalledHostsTooltip: function () {
+ return (this.get('noInstalledHosts')) ? Em.I18n.t('admin.stackVersions.version.emptyHostsTooltip') : Em.I18n.t('admin.stackVersions.version.hostsTooltip');
+ }.property('noInstalledHosts'),
+
+ /**
* @type {boolean}
*/
isVisible: true
http://git-wip-us.apache.org/repos/asf/ambari/blob/63c683f3/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_box.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_box.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_box.hbs
index 23dc285..138568f 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_box.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_box.hbs
@@ -55,20 +55,20 @@
<div class="hosts-bar">{{t common.hosts}}</div>
<div class="row-fluid host-link">
<div class="span4 align-center">
- <div><a href="#" {{bindAttr class="view.content.noInitHosts:empty-hosts-tooltip:hosts-tooltip :not-active"}}
- {{action showHosts view.versionStateMap.not_installed view.content.displayName view.content.notInstalledHosts target="view"}}>
+ <div><a href="#" class="hosts-tooltip not-active" {{bindAttr data-original-title="view.content.noInitHostsTooltip" }}
+ {{action showHosts view.versionStateMap.not_installed target="view"}}>
{{view.content.notInstalledHosts.length}}</a></div>
<div>{{t admin.stackVersions.version.notInstalled}}</div>
</div>
<div class="span4 align-center">
- <div><a href="#" {{bindAttr class="view.content.noInstalledHosts:empty-hosts-tooltip:hosts-tooltip :not-active"}}
- {{action showHosts view.versionStateMap.installed view.content.displayName view.content.installedHosts target="view"}}>
+ <div><a href="#" class="hosts-tooltip not-active" {{bindAttr data-original-title="view.content.noInstalledHostsTooltip" }}
+ {{action showHosts view.versionStateMap.installed target="view"}}>
{{view.content.installedHosts.length}}</a></div>
<div>{{t common.installed}}</div>
</div>
<div class="span4 align-center">
- <div><a href="#" {{bindAttr class="view.content.noCurrentHosts:empty-hosts-tooltip:hosts-tooltip :not-active"}}
- {{action showHosts view.versionStateMap.current view.content.displayName view.content.currentHosts target="view"}}>
+ <div><a href="#" class="hosts-tooltip not-active" {{bindAttr data-original-title="view.content.noCurrentHostsTooltip" }}
+ {{action showHosts view.versionStateMap.current target="view"}}>
{{view.content.currentHosts.length}}</a></div>
<div>{{t common.current}}</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/63c683f3/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 9958563..5326248 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
@@ -71,14 +71,17 @@ App.UpgradeVersionBoxView = Em.View.extend({
versionStateMap: {
'current': {
'id': 'current',
+ 'property': 'currentHosts',
'label': Em.I18n.t('admin.stackVersions.hosts.popup.header.current')
},
'installed': {
'id': 'installed',
+ 'property': 'installedHosts',
'label': Em.I18n.t('admin.stackVersions.hosts.popup.header.installed')
},
'not_installed': {
'id': 'installing',
+ 'property': 'notInstalledHosts',
'label': Em.I18n.t('admin.stackVersions.hosts.popup.header.not_installed')
}
},
@@ -155,8 +158,7 @@ App.UpgradeVersionBoxView = Em.View.extend({
didInsertElement: function () {
App.tooltip($('.link-tooltip'), {title: Em.I18n.t('admin.stackVersions.version.linkTooltip')});
- App.tooltip($('.hosts-tooltip'), {title: Em.I18n.t('admin.stackVersions.version.hostsTooltip')});
- App.tooltip($('.empty-hosts-tooltip'), {title: Em.I18n.t('admin.stackVersions.version.emptyHostsTooltip')});
+ App.tooltip($('.hosts-tooltip'));
App.tooltip($('.out-of-sync-badge'), {title: Em.I18n.t('hosts.host.stackVersions.status.out_of_sync')});
},
@@ -247,8 +249,8 @@ App.UpgradeVersionBoxView = Em.View.extend({
*/
showHosts: function (event) {
var status = event.contexts[0];
- var displayName = event.contexts[1];
- var hosts = event.contexts[2];
+ var displayName = this.get('content.displayName');
+ var hosts = this.get('content').get(status['property']);
var self = this;
if (hosts.length) {
return App.ModalPopup.show({
http://git-wip-us.apache.org/repos/asf/ambari/blob/63c683f3/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 867c96a..a4b914e 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
@@ -25,7 +25,7 @@ describe('App.UpgradeVersionBoxView', function () {
controller: Em.Object.create({
upgrade: Em.K
}),
- content: Em.K
+ content: Em.Object.create()
});
describe("#isUpgrading", function () {
@@ -113,7 +113,7 @@ describe('App.UpgradeVersionBoxView', function () {
});
it("init tooltips", function () {
view.didInsertElement();
- expect(App.tooltip.callCount).to.equal(4);
+ expect(App.tooltip.callCount).to.equal(3);
});
});
@@ -162,14 +162,21 @@ describe('App.UpgradeVersionBoxView', function () {
view.filterHostsByStack.restore();
});
it("no hosts", function () {
+ view.set('content', Em.Object.create({
+ p1: []
+ }));
view.showHosts({contexts: [
- 'status', 'version', []
+ {'property': 'p1'}
]});
expect(App.ModalPopup.show.called).to.be.false;
});
it("one host", function () {
+ view.set('content', Em.Object.create({
+ p1: ['host1'],
+ displayName: 'version'
+ }));
var popup = view.showHosts({contexts: [
- {id: 1}, 'version', ['host1']
+ {id: 1, 'property': 'p1'}
]});
expect(App.ModalPopup.show.calledOnce).to.be.true;
popup.onPrimary();