From 9ef22adc17b0f74aeee9debcfcf97404e1623d49 Mon Sep 17 00:00:00 2001 From: Wesley GALIPO Date: Mon, 17 Feb 2025 16:22:01 +0000 Subject: [PATCH] revert task request edition when resolution is paused --- .../utask-lib/src/lib/@routes/task/task.component.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ui/dashboard/projects/utask-lib/src/lib/@routes/task/task.component.ts b/ui/dashboard/projects/utask-lib/src/lib/@routes/task/task.component.ts index f5e412ef..6a500bb5 100644 --- a/ui/dashboard/projects/utask-lib/src/lib/@routes/task/task.component.ts +++ b/ui/dashboard/projects/utask-lib/src/lib/@routes/task/task.component.ts @@ -133,12 +133,14 @@ export class TaskComponent implements OnInit, OnDestroy { return !!meta?.user_is_admin; })); - readonly canEditRequest$ = combineLatest([this.task$, this._isResolver$]).pipe(map(([task, isResolver]) => { - if (!['TODO', 'PAUSED'].includes(task?.state)) { - return false; + readonly canEditRequest$ = combineLatest([this.task$, this.resolution$, this._isResolver$]).pipe(map(([task, resolution, isResolver]) => { + if (['TODO', 'PAUSED'].includes(task?.state)) { + return isResolver + } else if (['TODO', 'PAUSED'].includes(resolution?.state)) { + return isResolver + } else { + return false } - - return isResolver; }));; readonly canDeleteRequest$ = combineLatest([this.task$, this.meta$]).pipe(map(([task, meta]) => {