From 9fce264d84abdec3cb4de89932720771b3ccbca7 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Mon, 22 Apr 2024 16:24:39 +0800 Subject: [PATCH] * Move user account setting of repo. --- module/mr/ui/linktask.html.php | 1 + module/repo/config/dtable.php | 2 +- module/repo/ui/linktask.html.php | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/module/mr/ui/linktask.html.php b/module/mr/ui/linktask.html.php index c013175ad3..eefd2514f5 100644 --- a/module/mr/ui/linktask.html.php +++ b/module/mr/ui/linktask.html.php @@ -46,6 +46,7 @@ div $lang->repo->unlinkedTasks . "({$pager->recTotal})" ) ); +$config->repo->taskDtable->fieldList['assignedTo']['currentUser'] = $app->user->account; $allTasks = initTableData($allTasks, $config->repo->taskDtable->fieldList); $data = array_values($allTasks); dtable diff --git a/module/repo/config/dtable.php b/module/repo/config/dtable.php index a7276dbcb2..380186e290 100644 --- a/module/repo/config/dtable.php +++ b/module/repo/config/dtable.php @@ -213,7 +213,7 @@ $config->repo->taskDtable->fieldList['assignedTo']['type'] = 'user'; $config->repo->taskDtable->fieldList['assignedTo']['sortType'] = true; $config->repo->taskDtable->fieldList['assignedTo']['show'] = true; $config->repo->taskDtable->fieldList['assignedTo']['group'] = 3; -$config->repo->taskDtable->fieldList['assignedTo']['currentUser'] = $app->user->account; +$config->repo->taskDtable->fieldList['assignedTo']['currentUser'] = ''; $config->repo->taskDtable->fieldList['assignedTo']['title'] = $lang->task->assignedTo; $config->repo->taskDtable->fieldList['assignedTo']['assignLink'] = array('module' => 'task', 'method' => 'assignTo', 'params' => 'executionID={execution}&taskID={id}'); diff --git a/module/repo/ui/linktask.html.php b/module/repo/ui/linktask.html.php index 6edb8a0837..3dcede34dc 100644 --- a/module/repo/ui/linktask.html.php +++ b/module/repo/ui/linktask.html.php @@ -44,6 +44,7 @@ div $lang->repo->unlinkedTasks . "({$pager->recTotal})" ) ); +$config->repo->taskDtable->fieldList['assignedTo']['currentUser'] = $app->user->account; $allTasks = initTableData($allTasks, $config->repo->taskDtable->fieldList); $data = array_values($allTasks); dtable