From 2b924fbd9c6b40e0bfaba31501becd3781421c7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Wed, 8 Jan 2014 15:52:22 +0100 Subject: [PATCH] Feature #2570: Group wizard allows to select the resources that can be created --- src/sunstone/public/js/plugins/groups-tab.js | 91 ++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/src/sunstone/public/js/plugins/groups-tab.js b/src/sunstone/public/js/plugins/groups-tab.js index aff8680df7..7edecc160f 100644 --- a/src/sunstone/public/js/plugins/groups-tab.js +++ b/src/sunstone/public/js/plugins/groups-tab.js @@ -118,6 +118,51 @@ var create_group_tmpl = \ \
\ +
\ +
\ + '+tr("Resource creation")+':\ +
\ +
' + +tr("Allow users in this group to create the following resources")+ + '
\ +
\ +
'+tr("TODO")+'
\ +
\ +
\ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +
\ + '+tr("Virtual Machines")+''+tr("Virtual Networks")+''+tr("Images")+''+tr("Templates")+''+tr("Documents")+''+tr("Users")+'
'+tr("Group Users")+'\ +
'+tr("Admin Group Users")+'
\ +
\ +
\ +
\
\
\ '+tr("Administrators")+':\ @@ -996,10 +1041,18 @@ function setupCreateGroupDialog(){ $('#admin_user',dialog).prop("checked", "true"); enableAdminUser(dialog); + + $.each($('[id^="group_admin_res"]', dialog), function(){ + $(this).removeAttr("disabled"); + }); } else { $('#admin_group_name',dialog).attr('disabled','disabled'); $('#admin_user',dialog).attr('disabled','disabled'); disableAdminUser(dialog); + + $.each($('[id^="group_admin_res"]', dialog), function(){ + $(this).attr('disabled', 'disabled'); + }); } }); @@ -1016,6 +1069,15 @@ function setupCreateGroupDialog(){ $('#admin_user',dialog).attr('disabled','disabled'); disableAdminUser(dialog); + $.each($('[id^="group_res"]', dialog), function(){ + $(this).prop("checked", "true"); + }); + + $.each($('[id^="group_admin_res"]', dialog), function(){ + $(this).attr('disabled', 'disabled'); + $(this).prop("checked", "true"); + }); + OpenNebula.Zone.list({ timeout: true, success: function (request, obj_list){ @@ -1093,6 +1155,35 @@ function setupCreateGroupDialog(){ } }); + var resources = ""; + var separator = ""; + + $.each($('[id^="group_res"]:checked', dialog), function(){ + resources += (separator + $(this).val()); + separator = "+"; + }); + + group_json['group']['resources'] = resources; + + if (admin_group_name){ + resources = ""; + separator = ""; + + $.each($('[id^="group_admin_res"]:checked', dialog), function(){ + resources += (separator + $(this).val()); + separator = "+"; + }); + + group_json['group']['admin_group_resources'] = resources; + + if ( $('#group_admin_res_user', dialog).prop("checked") ){ + group_json['group']['admin_manage_users'] = "YES"; + } else { + group_json['group']['admin_manage_users'] = "NO"; + } + } + + Sunstone.runAction("Group.create",group_json); $create_group_dialog.trigger("reveal:close"); return false;