etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-3388:No error message shows when a dedicate operation failed during the creation of a pod/cluster

This commit is contained in:
Isaac Chiang 2013-07-22 15:33:48 +08:00
parent a75a62a318
commit 39a730ccd1
2 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ui/scripts/system.js
View File

@ -10126,7 +10126,9 @@
jobId: jid
},
notification: {
poll: pollAsyncJobResult
poll: pollAsyncJobResult,
interval: 4500,
desc: "Dedicate Pod"
},
data: item
@ -10141,12 +10143,10 @@
});
}
} else {
args.response.success({
data: item
});
}
args.response.success({
data: item
});
},
error: function(XMLHttpResponse) {
var errorMsg = parseXMLHttpResponse(XMLHttpResponse);
@ -11226,7 +11226,9 @@
jobId: jid
},
notification: {
poll: pollAsyncJobResult
poll: pollAsyncJobResult,
interval: 4500,
desc: "Dedicate Cluster"
},
data: $.extend(item, {
@ -11240,11 +11242,10 @@
}
});
}
} else {
args.response.success({
data: item
});
}
args.response.success({
data: item
});
},
error: function(XMLHttpResponse) {
var errorMsg = parseXMLHttpResponse(XMLHttpResponse);
@ -12458,7 +12459,9 @@
jobId: jid
},
notification: {
poll: pollAsyncJobResult
poll: pollAsyncJobResult,
interval: 4500,
desc: "Dedicate Host"
},
data: item
@ -12472,12 +12475,10 @@
}
});
}
} else {
args.response.success({
data: item
});
}
args.response.success({
data: item
});
},
error: function(XMLHttpResponse) {

22
ui/scripts/ui/widgets/listView.js
View File

@ -185,6 +185,8 @@
return false;
});
if(args.notification) notification = args.notification;
notification._custom = args._custom;
if (additional && additional.success) additional.success(args);
@ -250,25 +252,27 @@
// Error
function(args) {
function(errorArgs) {
if (!isHeader) {
if ($instanceRow.data('list-view-new-item')) {
// For create forms
$instanceRow.remove();
} else {
// For standard actions
replaceItem(
$instanceRow,
$.extend($instanceRow.data('json-obj'), args.data),
args.actionFilter ?
args.actionFilter :
$instanceRow.data('list-view-action-filter')
);
if(!args.notification) {
replaceItem(
$instanceRow,
$.extend($instanceRow.data('json-obj'), errorArgs.data),
errorArgs.actionFilter ?
errorArgs.actionFilter :
$instanceRow.data('list-view-action-filter')
);
}
}
}
if (options.error) {
options.error(args);
options.error(errorArgs);
}
}
);