Merge Minor into main #113

Manually merged
niggl merged 416 commits from dev into main 2021-03-26 16:34:56 +00:00
Showing only changes of commit cd9a5469fd - Show all commits

View File

@ -6,9 +6,11 @@
$: searchvalue = ""; $: searchvalue = "";
$: active_deletes = []; $: active_deletes = [];
export let current_groups = []; export let current_groups = [];
const groups_promise = UserGroupService.userGroupControllerGetAll().then((val) => { const groups_promise = UserGroupService.userGroupControllerGetAll().then(
current_groups = val; (val) => {
}); current_groups = val;
}
);
</script> </script>
{#if store.state.jwtinfo.userdetails.permissions.includes('USERGROUP:GET')} {#if store.state.jwtinfo.userdetails.permissions.includes('USERGROUP:GET')}