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

Update network section w/ fixes from beta2 branch

This commit is contained in:
bfederle 2011-12-21 14:46:54 -08:00
parent af8378f2ed
commit 8e6ee2089a
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ui/scripts/network.js
View File

@ -216,7 +216,12 @@
name: 'Guest network details',
viewAll: {
path: 'network.ipAddresses',
label: 'IP addresses'
label: 'IP addresses',
preFilter: function(args) {
if (args.context.networks[0].state == 'Destroyed') return false;
return true;
}
},
actions: {
edit: {
@ -405,11 +410,16 @@
},
vlan: { label: 'VLAN ID' },
scope: { label: 'Scope' },
networkofferingdisplaytext: { label: 'Network offering' },
//networkofferingdisplaytext: { label: 'Network offering' },
networkofferingid: {
label: 'Network offering',
isEditable: true,
select: function(args){
if (args.context.networks[0].state == 'Destroyed') {
args.response.success({ data: [] });
return;
}
var items = [];
$.ajax({
url: createURL("listNetworkOfferings&networkid=" + args.context.networks[0].id),
@ -437,10 +447,6 @@
}
},
networkofferingidText: {
label: 'Network offering ID'
},
gateway: { label: 'Gateway' },
//netmask: { label: 'Netmask' },
cidr: { label: 'CIDR' },
@ -453,8 +459,16 @@
}
}
],
dataProvider: function(args) {
args.response.success({data: args.context.networks[0]});
dataProvider: function(args) {
args.response.success({
actionFilter: function(args) {
if (args.context.networks[0].state == 'Destroyed')
return [];
return args.context.actions;
},
data: args.context.networks[0]
});
}
},
}