mirror of
https://github.com/apache/cloudstack.git
synced 2025-11-02 20:02:29 +01:00
cloudStack 3.0 new UI - system - zone chart - guest - network tab - network detail - edit - network offerings dropdown show only the current network offering in the network if "listNetworkOfferings&networkid=N" returns 0 items.
This commit is contained in:
parent
43c1a907df
commit
ed854ba221
@ -768,8 +768,8 @@
|
||||
var array1 = [];
|
||||
array1.push("&name=" + todb(args.data.name));
|
||||
array1.push("&displaytext=" + todb(args.data.displaytext));
|
||||
array1.push("&networkdomain=" + args.data.networkdomain);
|
||||
array1.push("&networkofferingid=" + todb(args.data.networkofferingid));
|
||||
array1.push("&networkdomain=" + args.data.networkdomain);
|
||||
array1.push("&networkofferingid=" + todb(args.data.networkofferingid)); //???
|
||||
$.ajax({
|
||||
url: createURL("updateNetwork&id=" + args.context.networks[0].id + array1.join("")),
|
||||
dataType: "json",
|
||||
@ -869,19 +869,34 @@
|
||||
networkofferingid: {
|
||||
label: 'Network offering',
|
||||
isEditable: true,
|
||||
select: function(args){
|
||||
select: function(args){
|
||||
var items = [];
|
||||
$.ajax({
|
||||
url: createURL("listNetworkOfferings&networkid=" + selectedGuestNetworkObj.id),
|
||||
url: createURL("listNetworkOfferings&networkid=" + selectedGuestNetworkObj.id), //???
|
||||
dataType: "json",
|
||||
success: function(json) {
|
||||
var networkOfferingObjs = json.listnetworkofferingsresponse.networkoffering;
|
||||
var items = [];
|
||||
async: false,
|
||||
success: function(json) {
|
||||
var networkOfferingObjs = json.listnetworkofferingsresponse.networkoffering;
|
||||
$(networkOfferingObjs).each(function() {
|
||||
items.push({id: this.id, description: this.displaytext});
|
||||
});
|
||||
args.response.success({data: items});
|
||||
});
|
||||
}
|
||||
});
|
||||
});
|
||||
if(items.length == 0) {
|
||||
$.ajax({
|
||||
url: createURL("listNetworkOfferings"),
|
||||
dataType: "json",
|
||||
async: false,
|
||||
success: function(json) {
|
||||
var networkOfferingObjs = json.listnetworkofferingsresponse.networkoffering;
|
||||
$(networkOfferingObjs).each(function() {
|
||||
if(this.id == selectedGuestNetworkObj.networkofferingid)
|
||||
items.push({id: this.id, description: this.displaytext});
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
args.response.success({data: items});
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user