You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2014/06/26 14:38:20 UTC
git commit: AMBARI-6084. NameNode HA and Security wizard: Empty
host-level progress popup comes up on clicking operation link. (Buzhor Denys
via akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 1a549c119 -> 71647f50f
AMBARI-6084. NameNode HA and Security wizard: Empty host-level progress popup comes up on clicking operation link. (Buzhor Denys via akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/71647f50
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/71647f50
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/71647f50
Branch: refs/heads/trunk
Commit: 71647f50f8563904eef91855d3423675b32e108e
Parents: 1a549c1
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Thu Jun 26 15:36:54 2014 +0300
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Thu Jun 26 15:37:08 2014 +0300
----------------------------------------------------------------------
ambari-web/app/utils/host_progress_popup.js | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/71647f50/ambari-web/app/utils/host_progress_popup.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/host_progress_popup.js b/ambari-web/app/utils/host_progress_popup.js
index c582cac..cfc06d1 100644
--- a/ambari-web/app/utils/host_progress_popup.js
+++ b/ambari-web/app/utils/host_progress_popup.js
@@ -528,7 +528,6 @@ App.HostPopup = Em.Object.create({
isServiceListHidden: false,
showTextArea: false,
isServiceEmptyList: true,
- isHostEmptyList: true,
isTasksEmptyList: true,
controller: this,
sourceRequestScheduleId: -1,
@@ -572,9 +571,9 @@ App.HostPopup = Em.Object.create({
* applied only to HOSTS_LIST and TASK_DETAILS levels, whereas async query used to obtain data
*/
isLevelLoaded: true,
- content: function() {
- return this.get('hosts') || [];
- }.property('hosts.length', 'isHostListHidden'),
+ isHostEmptyList: function() {
+ return !this.get('pageContent.length');
+ }.property('pageContent.length'),
currentHost: function () {
return this.get('hosts') && this.get('hosts').findProperty('name', this.get('controller.currentHostName'));
@@ -651,7 +650,7 @@ App.HostPopup = Em.Object.create({
filter: function() {
var _this = this,
filter = this.get('hostCategory.value'),
- hosts = this.get('content');
+ hosts = this.get('hosts') || [];
if (!filter || !hosts.length) return;
if (filter === 'all') {
this.set('filteredContent', hosts);
@@ -660,8 +659,7 @@ App.HostPopup = Em.Object.create({
return _this.get('filterMap')[filter].contains(item.status);
}));
}
- this.set("isHostEmptyList", !this.get('pageContent.length'));
- }.observes('content.length', 'hostCategory.value'),
+ }.observes('hosts.length', 'hostCategory.value'),
/**
* Reset startIndex property back to 1 when filter type has been changed.