refac
This commit is contained in:
1 parent
b147616080
commit
3ae44d11a5
2 files changed
+71
No files matched your search
@@ -171,10 +171,12 @@ class GroupTable:
|
|||||||
if share_value:
|
if share_value:
|
||||||
# Groups open to anyone: data is null, config.share is null, or share is true
|
# Groups open to anyone: data is null, config.share is null, or share is true
|
||||||
# Use case-insensitive string comparison to handle variations like "True", "TRUE"
|
# Use case-insensitive string comparison to handle variations like "True", "TRUE"
|
||||||
|
# Handle potential JSON boolean to string casting issues by checking for both string 'true' and boolean equivalence if possible,
|
||||||
anyone_can_share = or_(
|
anyone_can_share = or_(
|
||||||
Group.data.is_(None),
|
Group.data.is_(None),
|
||||||
json_share_str.is_(None),
|
json_share_str.is_(None),
|
||||||
json_share_lower == "true",
|
json_share_lower == "true",
|
||||||
|
json_share_lower == "1", # Handle SQLite boolean true
|
||||||
)
|
)
|
||||||
|
|
||||||
if member_id:
|
if member_id:
|
||||||
|
|||||||
@@ -0,0 +1,69 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { getContext } from 'svelte';
|
||||||
|
const i18n = getContext('i18n');
|
||||||
|
|
||||||
|
import Modal from '$lib/components/common/Modal.svelte';
|
||||||
|
import XMark from '$lib/components/icons/XMark.svelte';
|
||||||
|
import MemberSelector from '$lib/components/workspace/common/MemberSelector.svelte';
|
||||||
|
|
||||||
|
export let show = false;
|
||||||
|
export let onAdd = (payload: { userIds: string[]; groupIds: string[] }) => {};
|
||||||
|
|
||||||
|
let userIds: string[] = [];
|
||||||
|
let groupIds: string[] = [];
|
||||||
|
let loading = false;
|
||||||
|
|
||||||
|
const submitHandler = () => {
|
||||||
|
loading = true;
|
||||||
|
onAdd({ userIds, groupIds });
|
||||||
|
show = false;
|
||||||
|
|
||||||
|
userIds = [];
|
||||||
|
groupIds = [];
|
||||||
|
loading = false;
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<Modal size="sm" bind:show>
|
||||||
|
<div>
|
||||||
|
<div class=" flex justify-between dark:text-gray-100 px-5 pt-4 mb-1.5">
|
||||||
|
<div class="self-center text-base">
|
||||||
|
<div class="flex items-center gap-0.5 shrink-0">
|
||||||
|
{$i18n.t('Add Access')}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<button
|
||||||
|
class="self-center"
|
||||||
|
on:click={() => {
|
||||||
|
show = false;
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<XMark className={'size-5'} />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="flex flex-col md:flex-row w-full px-3 pb-4 md:space-x-4 dark:text-gray-200">
|
||||||
|
<div class=" flex flex-col w-full sm:flex-row sm:justify-center sm:space-x-6">
|
||||||
|
<form
|
||||||
|
class="flex flex-col w-full"
|
||||||
|
on:submit|preventDefault={() => {
|
||||||
|
submitHandler();
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<div class="flex flex-col w-full h-full pb-2">
|
||||||
|
<MemberSelector bind:userIds bind:groupIds includeGroups={true} />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="flex justify-end pt-3 text-sm font-medium gap-1.5">
|
||||||
|
<button
|
||||||
|
class="px-3.5 py-1.5 text-sm font-medium bg-black hover:bg-gray-950 text-white dark:bg-white dark:text-black dark:hover:bg-gray-100 transition rounded-full flex flex-row space-x-1 items-center"
|
||||||
|
type="submit"
|
||||||
|
>
|
||||||
|
{$i18n.t('Add')}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</Modal>
|
||||||
Reference in new issue
Block a user