Merge branch 'feature/new_task_members' into dev

2026-07-01 15:52:06 +02:00
parent 95c133389d 167365d0b3
commit 3a430a4d52
2 changed files with 30 additions and 23 deletions
@@ -63,9 +63,13 @@
        if (resp.ok){
            parent_task         = await resp.json();
            task.parent_task_id = +parent_task_id;
+            for (let [uid, member] of Object.entries(parent_task.members)){
+                if (['OWNER','ASSIGNEE'].includes(member.permission.name)) member.permission = { name: 'EDIT', code: 2 };
+                task.members[uid] = member;
+            }
            project_id          = +parent_task.project_id;
            yikes();
-            project             = null; // TODO
+            project             = null;
        } else error(resp);
    }

@@ -75,11 +79,17 @@
        if (resp.ok){
            project           = await resp.json();
            task.project_id   = +project_id;
+            if (Object.keys(task.members).length < 1) {
+                for (let [uid, member] of Object.entries(project.members)){
+                    if (['OWNER','ASSIGNEE'].includes(member.permission.name)) member.permission = { name: 'EDIT', code: 2 };
+                    task.members[uid] = member;
+                }
+            }
            if (assignee && project.members[assignee]){
                task.members[assignee] = project.members[assignee];
                task.members[assignee].permission = { name : "ASSIGNEE", code : 3 }
            }
-            if (task.taks.length < 1) task.tags = project.tags;
+            if (task.tags.length < 1) task.tags = project.tags;
            yikes();
        } else {
            error(resp);
@@ -124,6 +134,10 @@
        extendedSettings = !extendedSettings;
    }

+    function updatePermission(uid,perm){
+        task.members[uid].permission = perm;
+    }
+
    onMount(load);
 </script>

@@ -161,7 +175,7 @@
        {#if extendedSettings}
        <div>{t('members')}</div>
        <div>
-            <PermissionEditor members={task.members} {addMember} {dropMember} {getCandidates} />
+            <PermissionEditor members={task.members} {addMember} {dropMember} {getCandidates} {updatePermission} />
        </div>

        <div>{t('estimated_time')}</div>