From 9228e40433278b5984abd48aeb3323d046f2375b 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 Signed-off-by: Wesley GALIPO --- .../utask-lib/src/lib/@routes/task/task.component.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 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..eeb44193 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,8 +133,12 @@ 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)) { + readonly canEditRequest$ = combineLatest([this.task$, this.resolution$, this._isResolver$]).pipe(map(([task, resolution, isResolver]) => { + if (!['TODO', 'DELAYED', 'PAUSED'].includes(task?.state)) { + return false; + } + + if (!['TODO', 'PAUSED'].includes(resolution?.state)) { return false; }