Author: jaimin
Date: Fri Jun 14 17:48:49 2013
New Revision: 1493186
URL: http://svn.apache.org/r1493186
Log:
AMBARI-2383: Javascript error encountered occasionally on initializing Host
progress popup.
Modified:
incubator/ambari/trunk/ambari-web/app/utils/host_progress_popup.js
Modified: incubator/ambari/trunk/ambari-web/app/utils/host_progress_popup.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/utils/host_progress_popup.js?rev=1493186&r1=1493185&r2=1493186&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/utils/host_progress_popup.js
(original)
+++ incubator/ambari/trunk/ambari-web/app/utils/host_progress_popup.js Fri Jun
14 17:48:49 2013
@@ -98,9 +98,9 @@ App.HostPopup = Em.Object.create({
var progress = 0;
var actionsNumber = tasks.length;
var completedActions = tasks.filterProperty('Tasks.status',
'COMPLETED').length
- + tasks.filterProperty('Tasks.status', 'FAILED').length
- + tasks.filterProperty('Tasks.status', 'ABORTED').length
- + tasks.filterProperty('Tasks.status', 'TIMEDOUT').length;
+ + tasks.filterProperty('Tasks.status', 'FAILED').length
+ + tasks.filterProperty('Tasks.status', 'ABORTED').length
+ + tasks.filterProperty('Tasks.status', 'TIMEDOUT').length;
var queuedActions = tasks.filterProperty('Tasks.status', 'QUEUED').length;
var inProgressActions = tasks.filterProperty('Tasks.status',
'IN_PROGRESS').length;
progress = Math.ceil(((queuedActions * 0.09) + (inProgressActions * 0.35)
+ completedActions ) / actionsNumber * 100);
@@ -142,7 +142,7 @@ App.HostPopup = Em.Object.create({
barColor: 'progress-info',
barWidth: 'width:0%;'
});
- var allTasks = []
+ var allTasks = [];
service.hosts.forEach(function (tasks) {
tasks.logTasks.forEach(function (task) {
allTasks.push(task);
@@ -159,7 +159,7 @@ App.HostPopup = Em.Object.create({
newService.set('barWidth', "width:" + progress + "%;");
}
allNewServices.push(newService);
- })
+ });
self.set('servicesInfo', allNewServices);
if (this.get("serviceName") == "")
this.setBackgroundOperationHeader();
@@ -184,14 +184,14 @@ App.HostPopup = Em.Object.create({
});
}
else {
- if(this.get("currentServiceId") != null) {
+ if (this.get("currentServiceId") != null) {
hostsData = hostsData.filterProperty("id",
this.get("currentServiceId")).objectAt(0);
}
else {
hostsData = hostsData.filterProperty("name",
this.get("serviceName")).objectAt(0);
}
- if(hostsData && hostsData.hosts) {
+ if (hostsData && hostsData.hosts) {
hosts = hostsData.hosts;
}
@@ -325,10 +325,13 @@ App.HostPopup = Em.Object.create({
hosts: self.get("hosts"),
services: self.get('servicesInfo'),
- tasks: function() {
+ tasks: function () {
if (!this.get('controller.currentHostName')) return [];
- if (this.get('hosts')) {
- return this.get('hosts').findProperty('name',
this.get('controller.currentHostName')).get('tasks');
+ if (this.get('hosts') && this.get('hosts').length) {
+ var currentHost = this.get('hosts').findProperty('name',
this.get('controller.currentHostName'));
+ if (currentHost) {
+ return currentHost.get('tasks');
+ }
}
return [];
}.property('[email protected]', '[email protected][email protected]'),
@@ -630,11 +633,11 @@ App.HostPopup = Em.Object.create({
createClipBoard: function () {
$(".task-detail-log-clipboard-wrap").html('<textarea
class="task-detail-log-clipboard"></textarea>');
$(".task-detail-log-clipboard")
- .html("stderr: \n" + $(".stderr").html() + "\n stdout:\n" +
$(".stdout").html())
- .css("display", "block")
- .width($(".task-detail-log-maintext").width())
- .height($(".task-detail-log-maintext").height())
- .select();
+ .html("stderr: \n" + $(".stderr").html() + "\n stdout:\n" +
$(".stdout").html())
+ .css("display", "block")
+ .width($(".task-detail-log-maintext").width())
+ .height($(".task-detail-log-maintext").height())
+ .select();
$(".task-detail-log-maintext").css("display", "none")
},
