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

Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x

This commit is contained in:
Vijayendra Bhamidipati 2012-05-21 16:50:40 -07:00
parent 02d95e2b97 851e152dac
commit 704683d1f0
5 changed files with 71 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
View File

@ -542,7 +542,8 @@ public class VMTemplateDaoImpl extends GenericDaoBase<VMTemplateVO, Long> implem
}
}
if (!permittedAccounts.isEmpty() && !(templateFilter == TemplateFilter.featured || templateFilter == TemplateFilter.community) && !isAdmin(caller.getType()) ) {
if (!permittedAccounts.isEmpty() && !(templateFilter == TemplateFilter.featured ||
templateFilter == TemplateFilter.community || templateFilter == TemplateFilter.executable) && !isAdmin(caller.getType()) ) {
whereClause += attr + "t.account_id IN (" + permittedAccountsStr + ")";
}

3
server/src/com/cloud/user/AccountManagerImpl.java
View File

@ -269,7 +269,8 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag
@Override
public boolean isAdmin(short accountType) {
return ((accountType == Account.ACCOUNT_TYPE_ADMIN) || (accountType == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN) || (accountType == Account.ACCOUNT_TYPE_DOMAIN_ADMIN) || (accountType == Account.ACCOUNT_TYPE_READ_ONLY_ADMIN));
return ((accountType == Account.ACCOUNT_TYPE_ADMIN) || (accountType == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN)
|| (accountType == Account.ACCOUNT_TYPE_DOMAIN_ADMIN) || (accountType == Account.ACCOUNT_TYPE_READ_ONLY_ADMIN));
}
@Override

26
ui/scripts/instances.js
View File

@ -1549,11 +1549,31 @@
},
fields: [
{
{
displayname: { label: 'label.display.name', isEditable: true },
instancename: { label: 'label.internal.name' },
state: { label: 'label.state' },
state: {
label: 'label.state',
pollAgainIfValueIsIn: {
'Starting': 1,
'Stopping': 1
},
pollAgainFn: function(context) { //???
var toClearInterval = false;
$.ajax({
url: createURL("listVirtualMachines&id=" + context.instances[0].id),
dataType: "json",
async: false,
success: function(json) {
var jsonObj = json.listvirtualmachinesresponse.virtualmachine[0];
if(jsonObj.state != context.instances[0].state) {
toClearInterval = true; //to clear interval
}
}
});
return toClearInterval;
}
},
hypervisor: { label: 'label.hypervisor' },
templatename: { label: 'label.template' },
guestosid: {

31
ui/scripts/storage.js
View File

@ -33,14 +33,17 @@
fields: {
name: { label: 'label.name' },
type: { label: 'label.type' },
//hypervisor: { label: 'label.hypervisor' },
//vmdisplayname: { label: 'label.vm.display.name' },
state: {
hypervisor: { label: 'label.hypervisor' },
vmdisplayname: { label: 'label.vm.display.name' },
/*
state: {
label: 'State',
indicator: {
'Ready': 'on'
}
}
*/
},
// List view actions
@ -943,7 +946,27 @@
{
id: { label: 'ID' },
zonename: { label: 'label.zone' },
state: { label: 'label.state' },
state: {
label: 'label.state',
pollAgainIfValueIsIn: {
'UploadNotStarted': 1
},
pollAgainFn: function(context) { //???
var toClearInterval = false;
$.ajax({
url: createURL("listVolumes&id=" + context.volumes[0].id),
dataType: "json",
async: false,
success: function(json) {
var jsonObj = json.listvolumesresponse.volume[0];
if(jsonObj.state != context.volumes[0].state) {
toClearInterval = true; //to clear interval
}
}
});
return toClearInterval;
}
},
type: { label: 'label.type' },
storagetype: { label: 'label.storage.type' },
hypervisor: { label: 'label.hypervisor' },

18
ui/scripts/ui/widgets/detailView.js
View File

@ -680,7 +680,23 @@
} else if (key != 'name') {
isOddRow = true;
}
//???
/*
if("pollAgainIfValueIsIn" in value) {
if ((content in value.pollAgainIfValueIsIn) && (value.pollAgainFn != null)) {
//poll again
var intervalKey = setInterval(function() {
var toClearInterval = value.pollAgainFn(context);
if(toClearInterval == true) {
clearInterval(intervalKey);
$('.detail-view .toolbar .button.refresh').click(); //click Refresh button to refresh detailView
}
}, 2000);
}
}
*/
$name.html(_l(value.label));
$value.html(_s(content));