diff --git a/src/sunstone/public/js/plugins/groups-tab.js b/src/sunstone/public/js/plugins/groups-tab.js
index f1fd751625..5c7ab0f34a 100644
--- a/src/sunstone/public/js/plugins/groups-tab.js
+++ b/src/sunstone/public/js/plugins/groups-tab.js
@@ -159,7 +159,7 @@ var create_group_tmpl =
'+tr("TODO")+'
\
\
' +
- user_creation_div +
+ user_creation_div + // from users-tab.js
'\
\
\
@@ -821,8 +821,41 @@ function setupCreateGroupDialog(){
});
$('#create_group_form',dialog).submit(function(){
- var name=$('#name',this).val();
- var group_json = { "group" : { "name" : name }};
+ var name = $('#name',this).val();
+
+ // TODO
+ var cluster_ids = null;
+
+ var admin_group_name = null;
+ var user_json = null;
+
+ if ( $('#admin_group', this).prop('checked') ){
+ admin_group_name = $('#admin_group_name', this).val();
+
+ if ( $('#admin_user', this).prop('checked') ){
+ user_json = buildUserJSON(this); // from users-tab.js
+
+ if (!user_json) {
+ notifyError(tr("User name and password must be filled in"));
+ return false;
+ }
+ }
+ }
+
+ var group_json = {
+ "group" : {
+ "name" : name
+ }
+ };
+
+ if (admin_group_name){
+ group_json['group']['admin_group'] = admin_group_name;
+ }
+
+ if (user_json){
+ group_json["group"]["user"] = user_json["user"];
+ }
+
Sunstone.runAction("Group.create",group_json);
$create_group_dialog.trigger("reveal:close");
return false;
diff --git a/src/sunstone/public/js/plugins/users-tab.js b/src/sunstone/public/js/plugins/users-tab.js
index 8a43c21faa..4a7dc13ec2 100644
--- a/src/sunstone/public/js/plugins/users-tab.js
+++ b/src/sunstone/public/js/plugins/users-tab.js
@@ -831,6 +831,29 @@ function setupCustomAuthDialog(dialog){
});
};
+function buildUserJSON(dialog){
+ var user_name = $('#username',dialog).val();
+ var user_password = $('#pass',dialog).val();
+ var driver = $('#driver', dialog).val();
+
+ if (driver == 'custom'){
+ driver = $('input[name="custom_auth"]', dialog).val();
+ }
+
+ if (!user_name.length || !user_password.length){
+ return false;
+ }
+
+ var user_json = { "user" :
+ { "name" : user_name,
+ "password" : user_password,
+ "auth_driver" : driver
+ }
+ };
+
+ return user_json;
+};
+
// Prepare the user creation dialog
function setupCreateUserDialog(){
dialogs_context.append('');
@@ -845,23 +868,13 @@ function setupCreateUserDialog(){
setupCustomAuthDialog(dialog);
$('#create_user_form',dialog).submit(function(){
- var user_name=$('#username',this).val();
- var user_password=$('#pass',this).val();
- var driver = $('#driver', this).val();
- if (driver == 'custom')
- driver = $('input[name="custom_auth"]').val();
+ var user_json = buildUserJSON(this);
- if (!user_name.length || !user_password.length){
+ if (!user_json) {
notifyError(tr("User name and password must be filled in"));
return false;
- };
+ }
- var user_json = { "user" :
- { "name" : user_name,
- "password" : user_password,
- "auth_driver" : driver
- }
- };
Sunstone.runAction("User.create",user_json);
$create_user_dialog.trigger("reveal:close")
return false;
@@ -899,7 +912,7 @@ function setupChangeAuthenticationDialog(){
dialog.addClass("reveal-modal");
$('input[name="custom_auth"]',dialog).parent().hide();
- $('select#driver').change(function(){
+ $('select#driver', dialog).change(function(){
if ($(this).val() == "custom")
$('input[name="custom_auth"]',dialog).parent().show();
else