diff --git a/src/components/UserDetail.svelte b/src/components/UserDetail.svelte index ac28a1e3..a8fd61ab 100644 --- a/src/components/UserDetail.svelte +++ b/src/components/UserDetail.svelte @@ -43,6 +43,20 @@ allpermissions=allpermissions.concat([p.target + ":" + p.action]) }); }); + // editable_userdata.permissions=[]; + const user_permissions = UserService.userControllerGetPermissions(params.userid).then((val) => { + // console.log(val); + editable_userdata.permissions=[] + val.directlyGranted.forEach(p => { + editable_userdata.permissions=editable_userdata.permissions.concat([p.target + ":" + p.action]) + }); + val.inherited.forEach(p => { + editable_userdata.permissions=editable_userdata.permissions.concat([p.target + ":" + p.action]) + }); + // editable_userdata.permissions.push() + // console.log(val.directlyGranted); + // console.log(val.inherited); + }) $: changes_performed = !lodashIsEqual(original_data, editable_userdata); $: groups_changed = JSON.stringify(usergroups_array)===JSON.stringify(usergroups_array_original); $: save_enabled = changes_performed||!groups_changed; @@ -293,8 +307,8 @@ class="border-4 border-dashed rounded mb-4 p-5 text-lg text-center"> {#each allpermissions as p} {#if !editable_userdata.permissions.includes(p)} -

+

{p} -

+ class="w-full rounded-md border border-transparent shadow-sm px-4 py-2 bg-green-200 font-medium text-black hover:bg-green-700 hover:text-white focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-green-500 sm:ml-3 sm:w-auto sm:text-sm">+ +
{/if} {/each} @@ -313,16 +327,16 @@ class="border-4 border-dashed rounded mb-4 p-5 text-lg text-center"> {#each allpermissions as p} {#if editable_userdata.permissions.includes(p)} -

- {p} - -

+ class="w-full rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-400 font-medium text-black hover:bg-red-700 hover:text-white focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-500 sm:ml-3 sm:w-auto sm:text-sm">- + {p} + {/if} {/each}