From 6e5a4bcb39259fc376262c16ad95555fd9cf7a0b Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Sat, 16 Jan 2021 17:19:03 +0100 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20formatting?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ref #12 --- src/components/UserDetail.svelte | 74 ++++++++++++++++---------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/src/components/UserDetail.svelte b/src/components/UserDetail.svelte index f035a831..e3f8423c 100644 --- a/src/components/UserDetail.svelte +++ b/src/components/UserDetail.svelte @@ -18,7 +18,6 @@ $: allpermissions = []; $: allgroups = []; $: allgroups_ids = []; - $: usergroups_array_objects = []; $: usergroups_array = []; let usergroups_array_original = []; user_promise.then((data) => { @@ -26,7 +25,7 @@ original_data = Object.assign(original_data, data); editable_userdata = data; data.groups.forEach((g) => { - usergroups_array=usergroups_array.concat([g.id]); + usergroups_array = usergroups_array.concat([g.id]); }); usergroups_array_original = usergroups_array; allgroups.forEach((g) => { @@ -39,26 +38,27 @@ const permissions_promise = PermissionService.permissionControllerGetAll(); permissions_promise.then((data) => { data.forEach((p) => { - allpermissions=allpermissions.concat([p.target + ":" + p.action]) + 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]) + UserService.userControllerGetPermissions(params.userid).then((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, + ]); + }); }); - 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; + $: groups_changed = + JSON.stringify(usergroups_array) === + JSON.stringify(usergroups_array_original); + $: save_enabled = changes_performed || !groups_changed; function submit() { if ( !lodashIsEqual(original_data.permissions, editable_userdata.permissions) @@ -66,7 +66,7 @@ // TODO: add+delete permissions } if (data_loaded === true && save_enabled) { - editable_userdata.groups=usergroups_array; + editable_userdata.groups = usergroups_array; Toastify({ text: $_("updating-user"), duration: 2500, @@ -83,8 +83,7 @@ backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)", }).showToast(); }) - .catch((err) => { - }); + .catch((err) => {}); } else { } } @@ -93,8 +92,7 @@ .then((resp) => { location.replace("./"); }) - .catch((err) => { - }); + .catch((err) => {}); } @@ -180,8 +178,7 @@
-

Profile Picture

+

Profile Picture

{$_('profile-picture')}Active? -
-

{ - editable_userdata.enabled = !editable_userdata.enabled; - // TODO: this reactive set does not work? - }} - name="enabled" - type="checkbox" - checked={editable_userdata.enabled} - class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded" /> set the user active/ inactive

+
+

+ { + editable_userdata.enabled = !editable_userdata.enabled; + // TODO: this reactive set does not work? + }} + name="enabled" + type="checkbox" + checked={editable_userdata.enabled} + class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded" /> + set the user active/ inactive +