apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-1816: Cisco VNMC ASA1000v - UI - Infrastructure menu - physical network - network service providers - Cisco VNMC - fix a bug that detailView loads forever.

Browse Source
This commit is contained in:
Jessica Wang 2013-05-10 11:54:17 -07:00
parent b1f6d89141
commit 1177589a6b
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/modules/infrastructure/infrastructure.js
View File

@ -36,7 +36,7 @@
var selectedZoneObj = data.selectedZoneObj;
var selectedPhysicalNetworkObj = data.selectedPhysicalNetworkObj;
if(selectedZoneObj.networktype == "Advanced"){
var selectedProviderObj = {};
var selectedProviderObj = null;
$.ajax({
url: createURL('listNetworkServiceProviders'),
data: {
@ -55,7 +55,7 @@
nspHardcodingArray.push({
id: id,
name: name,
state: selectedProviderObj.state
state: selectedProviderObj? selectedProviderObj.state : 'Disabled'
});
}
});

15
ui/modules/vnmcNetworkProvider/vnmcNetworkProvider.js
View File

@ -278,8 +278,11 @@
id: { label: 'label.id' },
servicelist: {
label: 'Services',
converter: function(args){
return args.join(', ');
converter: function(args){
if(args)
return args.join(', ');
else
return '';
}
}
}
@ -296,6 +299,14 @@
if(items != null && items.length > 0) {
args.response.success({ data: items[0] });
}
else {
args.response.success({
data: {
name: 'CiscoVnmc',
state: 'Disabled'
}
})
}
}
});
}