shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-20 10:50:08 +03:00
Code Releases Wiki Activity

Feature #862, task #884: Minor corrections to ACLs support

Browse Source 
Permissions are shown in symbolic way.

ACL operations order changed in creation dialog.
(cherry picked from commit beb5871a1f12fb4755096dd8cae4901fe8f466ed)
This commit is contained in:
Hector Sanjuan 2012-01-10 13:58:08 +01:00 committed by Ruben S. Montero
parent 1830a284e1
commit a30193be04
6 changed files with 73 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sunstone/public/js/plugins/acls-tab.js
View File

@ -66,10 +66,10 @@ var create_acl_tmpl =
<select name="belonging_to" id="belonging_to"></select>\
<div class="clear"></div>\
<label style="height:5em;">'+tr("Allowed operations")+':</label>\
<input type="checkbox" name="right_create" class="right_cb" value="CREATE">'+tr("Create")+'</input><br />\
<input type="checkbox" name="right_delete" class="right_cb" value="USE">'+tr("Use")+'</input><br />\
<input type="checkbox" name="right_use" class="right_cb" value="MANAGE">'+tr("Manage")+'</input><br />\
<input type="checkbox" name="right_manage" class="right_cb" value="ADMIN">'+tr("Administrate")+'</input><br />\
<input type="checkbox" name="right_create" class="right_cb" value="CREATE">'+tr("Create")+'</input><br />\
<div class="clear"></div>\
<label for="acl_preview">'+tr("ACL String preview")+':</label>\
<input type="text" name="acl_preview" id="acl_preview" style="width:400px;"></input>\

38
src/sunstone/public/js/plugins/images-tab.js
View File

@ -197,15 +197,15 @@ var update_image_tmpl =
</tr>\
<tr>\
<td>'+tr("Group")+'</td>\
<td style="text-align:center"><input type="checkbox" name="vnet_owner_u" class="group_u" /></td>\
<td style="text-align:center"><input type="checkbox" name="vnet_owner_m" class="group_m" /></td>\
<td style="text-align:center"><input type="checkbox" name="vnet_owner_a" class="group_a" /></td>\
<td style="text-align:center"><input type="checkbox" name="vnet_group_u" class="group_u" /></td>\
<td style="text-align:center"><input type="checkbox" name="vnet_group_m" class="group_m" /></td>\
<td style="text-align:center"><input type="checkbox" name="vnet_group_a" class="group_a" /></td>\
</tr>\
<tr>\
<td>'+tr("Other")+'</td>\
<td style="text-align:center"><input type="checkbox" name="vnet_owner_u" class="other_u" /></td>\
<td style="text-align:center"><input type="checkbox" name="vnet_owner_m" class="other_m" /></td>\
<td style="text-align:center"><input type="checkbox" name="vnet_owner_a" class="other_a" /></td>\
<td style="text-align:center"><input type="checkbox" name="vnet_other_u" class="other_u" /></td>\
<td style="text-align:center"><input type="checkbox" name="vnet_other_m" class="other_m" /></td>\
<td style="text-align:center"><input type="checkbox" name="vnet_other_a" class="other_a" /></td>\
</tr>\
</table>\
</div>\
@ -629,19 +629,19 @@ function updateImageInfo(request,img){
<td class="key_td">'+tr("Running #VMS")+'</td>\
<td class="value_td">'+img_info.RUNNING_VMS+'</td>\
</tr>\
<tr><td></td><td></td></tr>\
<tr>\
<td class="key_td">'+tr("Owner permissions")+'</td>\
<td class="value_td">'+ownerPermStr(img_info)+'</td>\
</tr>\
<tr>\
<td class="key_td">'+tr("Group permissions")+'</td>\
<td class="value_td">'+groupPermStr(img_info)+'</td>\
</tr>\
<tr>\
<td class="key_td">'+tr("Other permissions")+'</td>\
<td class="value_td">'+otherPermStr(img_info)+'</td>\
</tr>\
<tr><td class="key_td">Permissions</td><td></td></tr>\
<tr>\
<td class="key_td">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'+tr("Owner")+'</td>\
<td class="value_td" style="font-family:monospace;">'+ownerPermStr(img_info)+'</td>\
</tr>\
<tr>\
<td class="key_td">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'+tr("Group")+'</td>\
<td class="value_td" style="font-family:monospace;">'+groupPermStr(img_info)+'</td>\
</tr>\
<tr>\
<td class="key_td"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'+tr("Other")+'</td>\
<td class="value_td" style="font-family:monospace;">'+otherPermStr(img_info)+'</td>\
</tr>\
</table>'
}

38
src/sunstone/public/js/plugins/templates-tab.js
View File

@ -605,15 +605,15 @@ var update_template_tmpl =
</tr>\
<tr>\
<td>'+tr("Group")+'</td>\
<td style="text-align:center"><input type="checkbox" name="vnet_owner_u" class="group_u" /></td>\
<td style="text-align:center"><input type="checkbox" name="vnet_owner_m" class="group_m" /></td>\
<td style="text-align:center"><input type="checkbox" name="vnet_owner_a" class="group_a" /></td>\
<td style="text-align:center"><input type="checkbox" name="vnet_group_u" class="group_u" /></td>\
<td style="text-align:center"><input type="checkbox" name="vnet_group_m" class="group_m" /></td>\
<td style="text-align:center"><input type="checkbox" name="vnet_group_a" class="group_a" /></td>\
</tr>\
<tr>\
<td>'+tr("Other")+'</td>\
<td style="text-align:center"><input type="checkbox" name="vnet_owner_u" class="other_u" /></td>\
<td style="text-align:center"><input type="checkbox" name="vnet_owner_m" class="other_m" /></td>\
<td style="text-align:center"><input type="checkbox" name="vnet_owner_a" class="other_a" /></td>\
<td style="text-align:center"><input type="checkbox" name="vnet_other_u" class="other_u" /></td>\
<td style="text-align:center"><input type="checkbox" name="vnet_other_m" class="other_m" /></td>\
<td style="text-align:center"><input type="checkbox" name="vnet_other_a" class="other_a" /></td>\
</tr>\
</table>\
</div>\
@ -953,19 +953,19 @@ function updateTemplateInfo(request,template){
<td class="key_td">'+tr("Register time")+'</td>\
<td class="value_td">'+pretty_time(template_info.REGTIME)+'</td>\
</tr>\
<tr><td></td><td></td></tr>\
<tr>\
<td class="key_td">'+tr("Owner permissions")+'</td>\
<td class="value_td">'+ownerPermStr(template_info)+'</td>\
</tr>\
<tr>\
<td class="key_td">'+tr("Group permissions")+'</td>\
<td class="value_td">'+groupPermStr(template_info)+'</td>\
</tr>\
<tr>\
<td class="key_td">'+tr("Other permissions")+'</td>\
<td class="value_td">'+otherPermStr(template_info)+'</td>\
</tr>\
<tr><td class="key_td">Permissions</td><td></td></tr>\
<tr>\
<td class="key_td">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'+tr("Owner")+'</td>\
<td class="value_td" style="font-family:monospace;">'+ownerPermStr(template_info)+'</td>\
</tr>\
<tr>\
<td class="key_td">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'+tr("Group")+'</td>\
<td class="value_td" style="font-family:monospace;">'+groupPermStr(template_info)+'</td>\
</tr>\
<tr>\
<td class="key_td"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'+tr("Other")+'</td>\
<td class="value_td" style="font-family:monospace;">'+otherPermStr(template_info)+'</td>\
</tr>\
</table>'
};
var template_tab = {

26
src/sunstone/public/js/plugins/vms-tab.js
View File

@ -114,15 +114,15 @@ var update_vm_tmpl =
</tr>\
<tr>\
<td>'+tr("Group")+'</td>\
<td style="text-align:center"><input type="checkbox" name="vm_owner_u" class="group_u" /></td>\
<td style="text-align:center"><input type="checkbox" name="vm_owner_m" class="group_m" /></td>\
<td style="text-align:center"><input type="checkbox" name="vm_owner_a" class="group_a" /></td>\
<td style="text-align:center"><input type="checkbox" name="vm_group_u" class="group_u" /></td>\
<td style="text-align:center"><input type="checkbox" name="vm_group_m" class="group_m" /></td>\
<td style="text-align:center"><input type="checkbox" name="vm_group_a" class="group_a" /></td>\
</tr>\
<tr>\
<td>'+tr("Other")+'</td>\
<td style="text-align:center"><input type="checkbox" name="vm_owner_u" class="other_u" /></td>\
<td style="text-align:center"><input type="checkbox" name="vm_owner_m" class="other_m" /></td>\
<td style="text-align:center"><input type="checkbox" name="vm_owner_a" class="other_a" /></td>\
<td style="text-align:center"><input type="checkbox" name="vm_other_u" class="other_u" /></td>\
<td style="text-align:center"><input type="checkbox" name="vm_other_m" class="other_m" /></td>\
<td style="text-align:center"><input type="checkbox" name="vm_other_a" class="other_a" /></td>\
</tr>\
</table>\
</div>\
@ -749,18 +749,18 @@ function updateVMInfo(request,vm){
<td class="key_td">'+tr("Deploy ID")+'</td>\
<td class="value_td">'+(typeof(vm_info.DEPLOY_ID) == "object" ? "-" : vm_info.DEPLOY_ID)+'</td>\
</tr>\
<tr><td></td><td></td></tr>\
<tr><td class="key_td">Permissions</td><td></td></tr>\
<tr>\
<td class="key_td">'+tr("Owner permissions")+'</td>\
<td class="value_td">'+ownerPermStr(vm_info)+'</td>\
<td class="key_td">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'+tr("Owner")+'</td>\
<td class="value_td" style="font-family:monospace;">'+ownerPermStr(vm_info)+'</td>\
</tr>\
<tr>\
<td class="key_td">'+tr("Group permissions")+'</td>\
<td class="value_td">'+groupPermStr(vm_info)+'</td>\
<td class="key_td">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'+tr("Group")+'</td>\
<td class="value_td" style="font-family:monospace;">'+groupPermStr(vm_info)+'</td>\
</tr>\
<tr>\
<td class="key_td">'+tr("Other permissions")+'</td>\
<td class="value_td">'+otherPermStr(vm_info)+'</td>\
<td class="key_td"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'+tr("Other")+'</td>\
<td class="value_td" style="font-family:monospace;">'+otherPermStr(vm_info)+'</td>\
</tr>\
</tbody>\
</table>\

24
src/sunstone/public/js/plugins/vnets-tab.js
View File

@ -163,14 +163,14 @@ var update_vnet_tmpl =
<tr>\
<td>'+tr("Group")+'</td>\
<td style="text-align:center"><input type="checkbox" name="vnet_owner_u" class="group_u" /></td>\
<td style="text-align:center"><input type="checkbox" name="vnet_owner_m" class="group_m" /></td>\
<td style="text-align:center"><input type="checkbox" name="vnet_owner_a" class="group_a" /></td>\
<td style="text-align:center"><input type="checkbox" name="vnet_group_m" class="group_m" /></td>\
<td style="text-align:center"><input type="checkbox" name="vnet_group_a" class="group_a" /></td>\
</tr>\
<tr>\
<td>'+tr("Other")+'</td>\
<td style="text-align:center"><input type="checkbox" name="vnet_owner_u" class="other_u" /></td>\
<td style="text-align:center"><input type="checkbox" name="vnet_owner_m" class="other_m" /></td>\
<td style="text-align:center"><input type="checkbox" name="vnet_owner_a" class="other_a" /></td>\
<td style="text-align:center"><input type="checkbox" name="vnet_other_u" class="other_u" /></td>\
<td style="text-align:center"><input type="checkbox" name="vnet_other_m" class="other_m" /></td>\
<td style="text-align:center"><input type="checkbox" name="vnet_other_a" class="other_a" /></td>\
</tr>\
</table>\
</div>\
@ -535,18 +535,18 @@ function updateVNetworkInfo(request,vn){
<td class="key_td">'+tr("VNET ID")+'</td>\
<td class="value_td">'+ (typeof(vn_info.VLAN_ID) == "object" ? "--": vn_info.VLAN_ID) +'</td>\
</tr>\
<tr><td></td><td></td></tr>\
<tr><td class="key_td">Permissions</td><td></td></tr>\
<tr>\
<td class="key_td">'+tr("Owner permissions")+'</td>\
<td class="value_td">'+ownerPermStr(vn_info)+'</td>\
<td class="key_td">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'+tr("Owner")+'</td>\
<td class="value_td" style="font-family:monospace;">'+ownerPermStr(vn_info)+'</td>\
</tr>\
<tr>\
<td class="key_td">'+tr("Group permissions")+'</td>\
<td class="value_td">'+groupPermStr(vn_info)+'</td>\
<td class="key_td">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'+tr("Group")+'</td>\
<td class="value_td" style="font-family:monospace;">'+groupPermStr(vn_info)+'</td>\
</tr>\
<tr>\
<td class="key_td">'+tr("Other permissions")+'</td>\
<td class="value_td">'+otherPermStr(vn_info)+'</td>\
<td class="key_td"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'+tr("Other")+'</td>\
<td class="value_td" style="font-family:monospace;">'+otherPermStr(vn_info)+'</td>\
</tr>\
</table>';

36
src/sunstone/public/js/sunstone-util.js
View File

@ -777,43 +777,25 @@ function otherAdmin(resource){
function ownerPermStr(resource){
var result = "";
if (ownerUse(resource))
result += tr("Use")+", ";
if (ownerManage(resource))
result += tr("Manage")+", ";
if (ownerAdmin(resource))
result += tr("Administrate")+", ";
//Remove ", " from end
result = result.substring(0,result.length-2);
result += ownerUse(resource) ? "u" : "-";
result += ownerManage(resource) ? "m" : "-";
result += ownerAdmin(resource) ? "a" : "-";
return result;
};
function groupPermStr(resource){
var result = "";
if (groupUse(resource))
result += tr("Use")+", ";
if (groupManage(resource))
result += tr("Manage")+", ";
if (groupAdmin(resource))
result += tr("Administrate")+", ";
//Remove ", " from end
result = result.substring(0,result.length-2);
result += groupUse(resource) ? "u" : "-";
result += groupManage(resource) ? "m" : "-";
result += groupAdmin(resource) ? "a" : "-";
return result;
};
function otherPermStr(resource){
var result = "";
if (otherUse(resource))
result += tr("Use")+", ";
if (otherManage(resource))
result += tr("Manage")+", ";
if (otherAdmin(resource))
result += tr("Administrate")+", ";
//Remove ", " from end
result = result.substring(0,result.length-2);
result += otherUse(resource) ? "u" : "-";
result += otherManage(resource) ? "m" : "-";
result += otherAdmin(resource) ? "a" : "-";
return result;
};