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

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack

This commit is contained in:
Pranav Saxena 2013-05-02 02:59:36 +05:30
parent 58648c4b53 60a8e881c1
commit fd2ae034f5
3 changed files with 58 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui/scripts/instanceWizard.js
View File

@ -317,7 +317,15 @@
url: createURL('listAffinityGroups'),
success: function(json) {
var items = json.listaffinitygroupsresponse.affinitygroup;
args.response.success({data: {affinityGroups: items}});
var data = {
affinityGroups: items
};
if('affinityGroups' in args.context) {
$.extend(data, {
selectedObj: args.context.affinityGroups[0]
});
}
args.response.success({data: data});
}
});
},

129
ui/scripts/system.js
View File

@ -184,16 +184,9 @@
dashboard: {
dataProvider: function(args) {
var dataFns = {
zoneCount: function(data) {
var data = {};
if(cloudStack.context.zoneType != null && cloudStack.context.zoneType.length > 0) { //Basic type or Advanced type
$.extend(data, {
networktype: cloudStack.context.zoneType
});
}
zoneCount: function(data) {
$.ajax({
url: createURL('listZones'),
data: data,
url: createURL('listZones'),
success: function(json) {
dataFns.podCount($.extend(data, {
zoneCount: json.listzonesresponse.count ?
@ -250,12 +243,7 @@
type: 'routing',
page: 1,
pagesize: 1 //specifying pagesize as 1 because we don't need any embedded objects to be returned here. The only thing we need from API response is "count" property.
};
if(cloudStack.context.zoneType != null && cloudStack.context.zoneType.length > 0) { //Basic type or Advanced type
$.extend(data2, {
zonetype: cloudStack.context.zoneType
});
}
};
$.ajax({
url: createURL('listHosts'),
data: data2,
@ -272,12 +260,7 @@
var data2 = {
page: 1,
pagesize: 1 //specifying pagesize as 1 because we don't need any embedded objects to be returned here. The only thing we need from API response is "count" property.
};
if(cloudStack.context.zoneType != null && cloudStack.context.zoneType.length > 0) { //Basic type or Advanced type
$.extend(data2, {
zonetype: cloudStack.context.zoneType
});
}
};
$.ajax({
url: createURL('listStoragePools'),
data: data2,
@ -294,12 +277,7 @@
type: 'SecondaryStorage',
page: 1,
pagesize: 1 //specifying pagesize as 1 because we don't need any embedded objects to be returned here. The only thing we need from API response is "count" property.
};
if(cloudStack.context.zoneType != null && cloudStack.context.zoneType.length > 0) { //Basic type or Advanced type
$.extend(data2, {
zonetype: cloudStack.context.zoneType
});
}
};
$.ajax({
url: createURL('listHosts'),
data: data2,
@ -333,12 +311,7 @@
projectid: -1,
page: 1,
pagesize: 1 //specifying pagesize as 1 because we don't need any embedded objects to be returned here. The only thing we need from API response is "count" property.
};
if(cloudStack.context.zoneType != null && cloudStack.context.zoneType.length > 0) { //Basic type or Advanced type
$.extend(data2, {
zonetype: cloudStack.context.zoneType
});
}
};
$.ajax({
url: createURL('listRouters'),
data: data2,
@ -349,12 +322,7 @@
listAll: true,
page: 1,
pagesize: 1 //specifying pagesize as 1 because we don't need any embedded objects to be returned here. The only thing we need from API response is "count" property.
};
if(cloudStack.context.zoneType != null && cloudStack.context.zoneType.length > 0) { //Basic type or Advanced type
$.extend(data3, {
zonetype: cloudStack.context.zoneType
});
}
};
$.ajax({
url: createURL('listRouters'),
data: data3,
@ -2332,12 +2300,7 @@
var data2 = {
forvpc: false
};
if(cloudStack.context.zoneType != null && cloudStack.context.zoneType.length > 0) { //Basic type or Advanced type
$.extend(data2, {
zonetype: cloudStack.context.zoneType
});
}
};
var routers = [];
$.ajax({
url: createURL("listRouters&zoneid=" + selectedZoneObj.id + "&listAll=true&page=" + args.page + "&pagesize=" + pageSize + array1.join("")),
@ -2817,12 +2780,7 @@
var data2 = {
forvpc: true
};
if(cloudStack.context.zoneType != null && cloudStack.context.zoneType.length > 0) { //Basic type or Advanced type
$.extend(data2, {
zonetype: cloudStack.context.zoneType
});
}
};
var routers = [];
$.ajax({
url: createURL("listRouters&zoneid=" + selectedZoneObj.id + "&listAll=true&page=" + args.page + "&pagesize=" + pageSize + array1.join("")),
@ -4708,12 +4666,7 @@
break;
}
}
}
if(args.context.zoneType != null && args.context.zoneType.length > 0) { //Basic type or Advanced type
array1.push("&networktype=" + args.context.zoneType);
}
}
$.ajax({
url: createURL("listZones&page=" + args.page + "&pagesize=" + pageSize + array1.join("")),
dataType: "json",
@ -5660,12 +5613,12 @@
var searchByArgs = args.filterBy.search.value.length ?
'&name=' + args.filterBy.search.value : '';
var data = { page: args.page, pageSize: pageSize, type: 'routing', listAll: true };
if(args.context.zoneType != null && args.context.zoneType.length > 0) { //Basic type or Advanced type
$.extend(data, {
zonetype: args.context.zoneType
});
}
var data = {
page: args.page,
pageSize: pageSize,
type: 'routing',
listAll: true
};
$.ajax({
url: createURL('listHosts' + searchByArgs),
@ -5714,11 +5667,7 @@
pageSize: pageSize,
listAll: true
};
if(args.context.zoneType != null && args.context.zoneType.length > 0) { //Basic type or Advanced type
$.extend(data, {
zonetype: args.context.zoneType
});
}
$.ajax({
url: createURL('listStoragePools' + searchByArgs),
data: data,
@ -5761,12 +5710,12 @@
var searchByArgs = args.filterBy.search.value.length ?
'&name=' + args.filterBy.search.value : '';
var data = { type: 'SecondaryStorage', page: args.page, pageSize: pageSize, listAll: true };
if(args.context.zoneType != null && args.context.zoneType.length > 0) { //Basic type or Advanced type
$.extend(data, {
zonetype: args.context.zoneType
});
}
var data = {
type: 'SecondaryStorage',
page: args.page,
pageSize: pageSize,
listAll: true
};
$.ajax({
url: createURL('listHosts' + searchByArgs),
@ -5850,18 +5799,11 @@
var listView = $.extend(true, {}, cloudStack.sections.system.subsections.virtualRouters.listView, {
dataProvider: function (args) {
var searchByArgs = args.filterBy.search.value.length ?
'&name=' + args.filterBy.search.value : '';
var data2 = {};
if(cloudStack.context.zoneType != null && cloudStack.context.zoneType.length > 0) { //Basic type or Advanced type
$.extend(data2, {
zonetype: cloudStack.context.zoneType
});
}
'&name=' + args.filterBy.search.value : '';
var routers = [];
$.ajax({
url: createURL("listRouters&listAll=true&page=" + args.page + "&pagesize=" + pageSize + searchByArgs),
data: data2,
url: createURL("listRouters&listAll=true&page=" + args.page + "&pagesize=" + pageSize + searchByArgs),
async: true,
success: function(json) {
var items = json.listroutersresponse.router ?
@ -5873,8 +5815,7 @@
// Get project routers
$.ajax({
url: createURL("listRouters&listAll=true&page=" + args.page + "&pagesize=" + pageSize + "&projectid=-1"),
data: data2,
url: createURL("listRouters&listAll=true&page=" + args.page + "&pagesize=" + pageSize + "&projectid=-1"),
async: true,
success: function(json) {
var items = json.listroutersresponse.router ?
@ -5961,11 +5902,7 @@
var data2 = {
forvpc: false
};
if(cloudStack.context.zoneType != null && cloudStack.context.zoneType.length > 0) { //Basic type or Advanced type
$.extend(data2, {
zonetype: cloudStack.context.zoneType
});
}
var routers = [];
$.ajax({
url: createURL("listRouters&zoneid=" + selectedZoneObj.id + "&listAll=true&page=" + args.page + "&pagesize=" + pageSize + array1.join("")),
@ -9209,11 +9146,7 @@
} else {
array1.push("&hostid=" + args.context.instances[0].hostid);
}
if(args.context.zoneType != null && args.context.zoneType.length > 0) { //Basic type or Advanced type
array1.push("&zonetype=" + args.context.zoneType);
}
$.ajax({
url: createURL("listHosts&type=Routing" + array1.join("") + "&page=" + args.page + "&pagesize=" + pageSize),
dataType: "json",
@ -10821,10 +10754,6 @@
}
array1.push("&zoneid=" + args.context.zones[0].id);
if(args.context.zoneType != null && args.context.zoneType.length > 0) { //Basic type or Advanced type
array1.push("&zonetype=" + args.context.zoneType);
}
$.ajax({
url: createURL("listHosts&type=SecondaryStorage&page=" + args.page + "&pagesize=" + pageSize + array1.join("")),
dataType: "json",

30
ui/scripts/ui-custom/instanceWizard.js
View File

@ -86,7 +86,7 @@
});
};
var makeSelects = function(name, data, fields, options) {
var makeSelects = function(name, data, fields, options, selectedObj) {
var $selects = $('<div>');
options = options ? options : {};
@ -151,7 +151,11 @@
.append($('<div>').addClass('desc').html(_s(this[fields.desc])))
)
.data('json-obj', this);
if(selectedObj != null && selectedObj.id == item.id) {
$select.find('input[type=checkbox]').attr('checked', 'checked');
}
$selects.append($select);
if (item._singleSelect) {
@ -493,14 +497,20 @@
)
);
$step.find('.select-container').append(
makeSelects('affinity-groups', args.data.affinityGroups, {
name: 'name',
desc: 'description',
id: 'id'
}, {
type: 'checkbox',
'wizard-field': 'affinity-groups'
})
makeSelects(
'affinity-groups',
args.data.affinityGroups,
{
name: 'name',
desc: 'description',
id: 'id'
},
{
type: 'checkbox',
'wizard-field': 'affinity-groups'
},
args.data.selectedObj
)
);
} else {
$step.find('.select-container').append($('<p>').html(_l('message.no.affinity.groups')));