From d65b463547a5cb4fb6f6de0f95795a66ebe92e31 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Sat, 16 Jan 2021 17:31:17 +0100 Subject: [PATCH] UserDetail - add permission layout ref #12 --- src/components/UserDetail.svelte | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/src/components/UserDetail.svelte b/src/components/UserDetail.svelte index e3f8423c..2dc3e7d7 100644 --- a/src/components/UserDetail.svelte +++ b/src/components/UserDetail.svelte @@ -12,6 +12,8 @@ export let params; const user_promise = UserService.userControllerGetOne(params.userid); let data_loaded = false; + let usergroups_array_original = []; + let vererbte = []; $: delete_triggered = false; $: original_data = {}; $: editable_userdata = {}; @@ -19,7 +21,6 @@ $: allgroups = []; $: allgroups_ids = []; $: usergroups_array = []; - let usergroups_array_original = []; user_promise.then((data) => { data_loaded = true; original_data = Object.assign(original_data, data); @@ -42,6 +43,7 @@ }); }); UserService.userControllerGetPermissions(params.userid).then((val) => { + console.log(val); editable_userdata.permissions = []; val.directlyGranted.forEach((p) => { editable_userdata.permissions = editable_userdata.permissions.concat([ @@ -49,9 +51,7 @@ ]); }); val.inherited.forEach((p) => { - editable_userdata.permissions = editable_userdata.permissions.concat([ - p.target + ":" + p.action, - ]); + vererbte = vererbte.concat([p.target + ":" + p.action]); }); }); $: changes_performed = !lodashIsEqual(original_data, editable_userdata); @@ -288,15 +288,16 @@
-
+
verfügbare
-
erteilte
+
erteilte
+
vererbte
{#if allpermissions.length > 0} -
+
{#each allpermissions as p} @@ -316,7 +317,7 @@ {/each}
-
+
{#each allpermissions as p} @@ -335,6 +336,20 @@ {/each}
+
+
+ {#each vererbte as p} +
+ + {p} +
+ {/each} +
+
{/if}