From 080ec23368ec26d7fc78ab458a3b8ef89be7719e Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Thu, 31 Jan 2013 16:59:26 +0100 Subject: [PATCH] feature #1664: Add permissions honogenously accross tabs Remove "All" from datatable headers --- .../public/js/plugins/clusters-tab.js | 8 +- .../public/js/plugins/datastores-tab.js | 10 +- src/sunstone/public/js/plugins/hosts-tab.js | 2 +- src/sunstone/public/js/plugins/images-tab.js | 41 +++---- src/sunstone/public/js/plugins/vms-tab.js | 32 +++++- src/sunstone/public/js/plugins/vnets-tab.js | 10 +- src/sunstone/public/js/sunstone-util.js | 102 +++++++++--------- 7 files changed, 115 insertions(+), 90 deletions(-) diff --git a/src/sunstone/public/js/plugins/clusters-tab.js b/src/sunstone/public/js/plugins/clusters-tab.js index 06f89e76c1..14e33999eb 100644 --- a/src/sunstone/public/js/plugins/clusters-tab.js +++ b/src/sunstone/public/js/plugins/clusters-tab.js @@ -20,7 +20,7 @@ var host_datatable_table_tmpl='\ \ - ' + tr("All") + '\ + \ ' + tr("ID") + '\ ' + tr("Name") + '\ ' + tr("Cluster") + '\ @@ -40,7 +40,7 @@ var host_datatable_table_tmpl='\ var vnet_datatable_table_tmpl='\ \ - '+tr("All")+'\ + \ '+tr("ID")+'\ '+tr("Owner")+'\ '+tr("Group")+'\ @@ -56,7 +56,7 @@ var vnet_datatable_table_tmpl='\ var datastore_datatable_table_tmpl='\ \ - ' + tr("All") + '\ + \ '+tr("ID")+'\ '+tr("Owner")+'\ '+tr("Group")+'\ @@ -848,7 +848,7 @@ var clusters_tab_content = '\ \ \ \ - \ + \ \ \ \ diff --git a/src/sunstone/public/js/plugins/datastores-tab.js b/src/sunstone/public/js/plugins/datastores-tab.js index 86f37d8c6c..93b711ec49 100644 --- a/src/sunstone/public/js/plugins/datastores-tab.js +++ b/src/sunstone/public/js/plugins/datastores-tab.js @@ -25,7 +25,7 @@ var datastores_tab_content = '\
' + tr("All") + '' + tr("ID") + '' + tr("Name") + '' + tr("Hosts") + '
\ \ \ - \ + \ \ \ \ @@ -497,8 +497,12 @@ function updateDatastoreInfo(request,ds){ info.ID) // Inserts the change permissions table - info_tab_content += insert_permissions_table("Datastore",info.ID); - + info_tab_content += insert_permissions_table("Datastore", + info.ID, + info.UNAME, + info.GNAME, + info.UID, + info.GID); var info_tab = { title : tr("Information"), diff --git a/src/sunstone/public/js/plugins/hosts-tab.js b/src/sunstone/public/js/plugins/hosts-tab.js index 06df6755a8..e0e886a570 100644 --- a/src/sunstone/public/js/plugins/hosts-tab.js +++ b/src/sunstone/public/js/plugins/hosts-tab.js @@ -44,7 +44,7 @@ var hosts_tab_content = '\
' + tr("All") + ''+tr("ID")+''+tr("Owner")+''+tr("Group")+'
\ \ \ - \ + \ \ \ \ diff --git a/src/sunstone/public/js/plugins/images-tab.js b/src/sunstone/public/js/plugins/images-tab.js index 8ce472bf0e..c5e585a718 100644 --- a/src/sunstone/public/js/plugins/images-tab.js +++ b/src/sunstone/public/js/plugins/images-tab.js @@ -24,7 +24,7 @@ var images_tab_content = '\
' + tr("All") + '' + tr("ID") + '' + tr("Name") + '' + tr("Cluster") + '
\ \ \ - \ + \ \ \ \ @@ -245,26 +245,6 @@ var image_actions = { } }, - "Image.fetch_template" : { - type: "single", - call: OpenNebula.Image.fetch_template, - callback: function (request,response) { - $('#image_template_update_dialog #image_template_update_textarea').val(response.template); - }, - error: onError - }, - - "Image.fetch_permissions" : { - type: "single", - call: OpenNebula.Image.show, - callback: function(request,image_json){ - var dialog = $('#image_template_update_dialog form'); - var image = image_json.IMAGE; - setPermissionsTable(image,dialog); - }, - error: onError - }, - "Image.update_template" : { type: "single", call: OpenNebula.Image.update, @@ -335,6 +315,7 @@ var image_actions = { call: OpenNebula.Image.chown, callback: function (req) { Sunstone.runAction("Image.show",req.request.data[0][0]); + Sunstone.runAction('Image.showinfo',request.request.data[0]); }, elements: imageElements, error: onError, @@ -346,6 +327,7 @@ var image_actions = { call: OpenNebula.Image.chgrp, callback: function (req) { Sunstone.runAction("Image.show",req.request.data[0][0]); + Sunstone.runAction('Image.showinfo',request.request.data[0]); }, elements: imageElements, error: onError, @@ -619,10 +601,17 @@ function updateImageInfo(request,img){ \ \ \ -
'+tr("All")+''+tr("ID")+''+tr("Owner")+''+tr("Group")+''+tr("Running #VMS")+''+img_info.RUNNING_VMS+'
' + insert_extended_template_table(img_info.TEMPLATE, - "Image", - img_info.ID) + - insert_permissions_table("Image",img_info.ID) + ' + + + insert_extended_template_table(img_info.TEMPLATE, + "Image", + img_info.ID) + + insert_permissions_table("Image", + img_info.ID, + img_info.UNAME, + img_info.GNAME, + img_info.UID, + img_info.GID) } $("#div_edit_rename_link").die(); @@ -693,6 +682,8 @@ function updateImageInfo(request,img){ Sunstone.updateInfoPanelTab("image_info_panel","image_info_tab",info_tab); Sunstone.popUpInfoPanel("image_info_panel"); + setPermissionsTable(img_info,''); + } // Prepare the image creation dialog diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js index 8b3dfbef5b..6f75e38691 100644 --- a/src/sunstone/public/js/plugins/vms-tab.js +++ b/src/sunstone/public/js/plugins/vms-tab.js @@ -68,7 +68,7 @@ var vms_tab_content = '\ \ \ \ - \ + \ \ \ \ @@ -477,7 +477,21 @@ var vm_buttons = { text: tr("Shutdown"), tip: tr("This will initiate the shutdown process in the selected VMs") }, + "VM.chown" : { + type: "confirm_with_select", + text: tr("Change owner"), + select: users_sel, + tip: tr("Select the new owner")+":", + condition: mustBeAdmin + }, + "VM.chgrp" : { + type: "confirm_with_select", + text: tr("Change group"), + select: groups_sel, + tip: tr("Select the new group")+":", + condition: mustBeAdmin + }, "action_list" : { type: "select", actions: { @@ -956,10 +970,18 @@ function updateVMInfo(request,vm){ \ \ \ -
'+tr("All")+''+tr("ID")+''+tr("Owner")+''+tr("Group")+''+(typeof(vm_info.DEPLOY_ID) == "object" ? "-" : vm_info.DEPLOY_ID)+'
' + insert_extended_template_table(vm_info.USER_TEMPLATE, - "VM", - vm_info.ID) + - insert_permissions_table("VM",vm_info.ID, vm_info.UNAME, vm_info.GNAME, vm_info.UID, vm_info.GID) + + ' + + + insert_extended_template_table(vm_info.USER_TEMPLATE, + "VM", + vm_info.ID) + + insert_permissions_table("VM", + vm_info.ID, + vm_info.UNAME, + vm_info.GNAME, + vm_info.UID, + vm_info.GID) + + '\ \ \ diff --git a/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js index 65e1ae118b..6b960da319 100644 --- a/src/sunstone/public/js/plugins/vnets-tab.js +++ b/src/sunstone/public/js/plugins/vnets-tab.js @@ -24,7 +24,7 @@ var vnets_tab_content = '\
'+tr("Monitoring information")+'
\ \ \ - \ + \ \ \ \ @@ -598,8 +598,12 @@ function updateVNetworkInfo(request,vn){ "Network", vn_info.ID); - info_tab_content += insert_permissions_table("Network",vn_info.ID); - + info_tab_content += insert_permissions_table("Network", + vn_info.ID, + vn_info.UNAME, + vn_info.GNAME, + vn_info.UID, + vn_info.GID); var info_tab = { title: tr("Information"), diff --git a/src/sunstone/public/js/sunstone-util.js b/src/sunstone/public/js/sunstone-util.js index 6e9f486ff9..fcab5f77c7 100644 --- a/src/sunstone/public/js/sunstone-util.js +++ b/src/sunstone/public/js/sunstone-util.js @@ -1406,7 +1406,7 @@ function buildOctet(permTable){ // Returns HTML with listeners to control permissions -function insert_permissions_table(resource_type,resource_id, owner, group, uid, gid){ +function insert_permissions_table(resource_type,resource_id, owner, group, vm_uid, vm_gid){ var str ='
'+tr("All")+''+tr("ID")+''+tr("Owner")+''+tr("Group")+'
\ \ \ @@ -1430,8 +1430,11 @@ function insert_permissions_table(resource_type,resource_id, owner, group, uid, \ \ \ - \ - \\ + ' + + if (mustBeAdmin()) + { + str += '\\ \ \ \ @@ -1452,6 +1455,53 @@ function insert_permissions_table(resource_type,resource_id, owner, group, uid, \
'+tr("Permissions")+':
'+tr("Ownership")+'
'+tr("Ownership")+'
'+tr("Owner")+'
' + // Handlers for chown + $("#div_edit_chg_owner_link").die(); + $("#user_confirm_select").die(); + + // Listener for key,value pair edit action + $("#div_edit_chg_owner_link").live("click", function() { + var value_str = $("#value_td_owner").text(); + var select_str='"; + $("#value_td_owner").html(select_str); + $("select#user_confirm_select").val(vm_uid); + }); + + $("#user_confirm_select").live("change", function() { + var value_str = $('select#user_confirm_select').val(); + if(value_str!="") + { + // Let OpenNebula know + Sunstone.runAction(resource_type+".chown",resource_id,value_str); + } + }); + + // Handlers for chgrp + $("#div_edit_chg_group_link").die(); + $("#group_confirm_select").die(); + + // Listener for key,value pair edit action + $("#div_edit_chg_group_link").live("click", function() { + var value_str = $("#value_td_group").text(); + var select_str='"; + $("#value_td_group").html(select_str); + $("select#group_confirm_select").val(vm_gid); + }); + + $("#group_confirm_select").live("change", function() { + var value_str = $('select#group_confirm_select').val(); + if(value_str!="") + { + // Let OpenNebula know + Sunstone.runAction(resource_type+".chgrp",resource_id,value_str); + } + }); + } + $(".permission_check").die(); $(".permission_check").live('change',function(){ var permissions_table = $("."+resource_type.toLowerCase()+"_permissions_table"); @@ -1460,52 +1510,6 @@ function insert_permissions_table(resource_type,resource_id, owner, group, uid, Sunstone.runAction(resource_type+".chmod",resource_id,permissions_octect); }); - // Handlers for chown - $("#div_edit_chg_owner_link").die(); - $("#user_confirm_select").die(); - - // Listener for key,value pair edit action - $("#div_edit_chg_owner_link").live("click", function() { - var value_str = $("#value_td_owner").text(); - var select_str='"; - $("#value_td_owner").html(select_str); - $("select#user_confirm_select").val(uid); - }); - - $("#user_confirm_select").live("change", function() { - var value_str = $('select#user_confirm_select').val(); - if(value_str!="") - { - // Let OpenNebula know - Sunstone.runAction(resource_type+".chown",resource_id,value_str); - } - }); - - // Handlers for chgrp - $("#div_edit_chg_group_link").die(); - $("#group_confirm_select").die(); - - // Listener for key,value pair edit action - $("#div_edit_chg_group_link").live("click", function() { - var value_str = $("#value_td_group").text(); - var select_str='"; - $("#value_td_group").html(select_str); - $("select#group_confirm_select").val(gid); - }); - - $("#group_confirm_select").live("change", function() { - var value_str = $('select#group_confirm_select').val(); - if(value_str!="") - { - // Let OpenNebula know - Sunstone.runAction(resource_type+".chgrp",resource_id,value_str); - } - }); - return str; } \ No newline at end of file