From f823f0f2bd09338e001e2e2342ae32ac73fa4b06 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Wed, 20 Jan 2016 16:53:14 +0100 Subject: [PATCH] Use new ResourceSelect in the ACL creation form --- .../app/tabs/acls-tab/form-panels/create.js | 35 ++++++++++++++----- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/src/sunstone/public/app/tabs/acls-tab/form-panels/create.js b/src/sunstone/public/app/tabs/acls-tab/form-panels/create.js index 129827595e..76b71381f6 100644 --- a/src/sunstone/public/app/tabs/acls-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/acls-tab/form-panels/create.js @@ -273,18 +273,35 @@ define(function(require) { } function _onShow(context) { - ResourceSelect.insert('div#applies_to_user', context, "User", null, true); - ResourceSelect.insert('div#applies_to_group', context, "Group", null, true); + ResourceSelect.insert({ + context: $('#applies_to_user', context), + resourceName: 'User', + emptyValue: true + }); - ResourceSelect.insert('div#belonging_to', context, "Group", null, true); - ResourceSelect.insert('#in_cluster',context, "Cluster", null, true); + ResourceSelect.insert({ + context: $('#applies_to_group', context), + resourceName: 'Group', + emptyValue: true + }); - // TODO BUG: doesn't work if the cluster.list callback is not finished yet - // Delete cluster -1 option - $('#in_cluster select option[value="-1"]',context).remove(); + ResourceSelect.insert({ + context: $('#belonging_to', context), + resourceName: 'Group', + emptyValue: true + }); - ResourceSelect.insert('div#zones_applies', context, "Zone", "*", false, - ''); + ResourceSelect.insert({ + context: $('#in_cluster', context), + resourceName: 'Cluster', + emptyValue: true + }); + ResourceSelect.insert({ + context: $('#zones_applies', context), + resourceName: 'Zone', + initValue: '*', + extraOptions: '' + }); } });