From 5d1a3cdcbcf0ec9dcd5ebb277bbed6385d1a5d18 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Sat, 21 Dec 2024 14:12:52 +0800
Subject: [PATCH] * [task#134172,start,1h] add pri and language items for
 testtask::assignCase.

---
 module/group/lang/resource.php   | 22 ++++++++++++----------
 module/group/packagemanager.php  | 23 ++++++++++++-----------
 module/testtask/config.php       |  1 +
 module/testtask/config/form.php  |  5 +++++
 module/testtask/config/table.php |  9 +++++----
 module/testtask/lang/de.php      |  1 +
 module/testtask/lang/en.php      |  1 +
 module/testtask/lang/fr.php      |  1 +
 module/testtask/lang/zh-cn.php   |  1 +
 9 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 2aef888eb2..368ff461c5 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -1214,6 +1214,7 @@ $lang->resource->testtask->edit             = 'edit';
 $lang->resource->testtask->start            = 'startAction';
 $lang->resource->testtask->close            = 'closeAction';
 $lang->resource->testtask->delete           = 'delete';
+$lang->resource->testtask->assignCase       = 'assignCase';
 $lang->resource->testtask->batchAssign      = 'batchAssign';
 $lang->resource->testtask->linkcase         = 'linkCase';
 $lang->resource->testtask->unlinkcase       = 'lblUnlinkCase';
@@ -1240,16 +1241,17 @@ $lang->testtask->methodOrder[40]  = 'activate';
 $lang->testtask->methodOrder[45]  = 'block';
 $lang->testtask->methodOrder[50]  = 'close';
 $lang->testtask->methodOrder[55]  = 'delete';
-$lang->testtask->methodOrder[60]  = 'batchAssign';
-$lang->testtask->methodOrder[65]  = 'linkcase';
-$lang->testtask->methodOrder[70]  = 'unlinkcase';
-$lang->testtask->methodOrder[75]  = 'runcase';
-$lang->testtask->methodOrder[80]  = 'results';
-$lang->testtask->methodOrder[85]  = 'batchUnlinkCases';
-$lang->testtask->methodOrder[90]  = 'report';
-$lang->testtask->methodOrder[95]  = 'browseUnits';
-$lang->testtask->methodOrder[100] = 'unitCases';
-$lang->testtask->methodOrder[105] = 'importUnitResult';
+$lang->testtask->methodOrder[60]  = 'assignCase';
+$lang->testtask->methodOrder[65]  = 'batchAssign';
+$lang->testtask->methodOrder[70]  = 'linkcase';
+$lang->testtask->methodOrder[75]  = 'unlinkcase';
+$lang->testtask->methodOrder[80]  = 'runcase';
+$lang->testtask->methodOrder[85]  = 'results';
+$lang->testtask->methodOrder[90]  = 'batchUnlinkCases';
+$lang->testtask->methodOrder[95]  = 'report';
+$lang->testtask->methodOrder[100] = 'browseUnits';
+$lang->testtask->methodOrder[105] = 'unitCases';
+$lang->testtask->methodOrder[110] = 'importUnitResult';
 
 $lang->resource->testreport = new stdclass();
 $lang->resource->testreport->browse     = 'browse';
diff --git a/module/group/packagemanager.php b/module/group/packagemanager.php
index c9ccc86e6a..bfe427960a 100644
--- a/module/group/packagemanager.php
+++ b/module/group/packagemanager.php
@@ -1907,18 +1907,19 @@ $config->group->package->manageTesttask = new stdclass();
 $config->group->package->manageTesttask->order  = 10;
 $config->group->package->manageTesttask->subset = 'testtask';
 $config->group->package->manageTesttask->privs  = array();
-$config->group->package->manageTesttask->privs['testtask-create']           = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 0, 'depend' => array(), 'recommend' => array('testtask-activate', 'testtask-block', 'testtask-close', 'testtask-edit', 'testtask-start'));
-$config->group->package->manageTesttask->privs['testtask-edit']             = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 1, 'depend' => array(), 'recommend' => array('testtask-activate', 'testtask-block', 'testtask-close', 'testtask-create', 'testtask-start'));
-$config->group->package->manageTesttask->privs['testtask-start']            = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 2, 'depend' => array(), 'recommend' => array('testtask-activate', 'testtask-block', 'testtask-close', 'testtask-create', 'testtask-edit'));
-$config->group->package->manageTesttask->privs['testtask-activate']         = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 3, 'depend' => array(), 'recommend' => array('testtask-block', 'testtask-close', 'testtask-create', 'testtask-edit', 'testtask-start'));
-$config->group->package->manageTesttask->privs['testtask-block']            = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 4, 'depend' => array(), 'recommend' => array('testtask-activate', 'testtask-close', 'testtask-create', 'testtask-edit', 'testtask-start'));
-$config->group->package->manageTesttask->privs['testtask-close']            = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array(), 'recommend' => array('testtask-activate', 'testtask-block', 'testtask-create', 'testtask-edit', 'testtask-start'));
-$config->group->package->manageTesttask->privs['testtask-batchAssign']      = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 12, 'depend' => array('testtask-cases'), 'recommend' => array());
-$config->group->package->manageTesttask->privs['testtask-linkcase']         = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 6, 'depend' => array('testtask-cases'), 'recommend' => array('testtask-unlinkcase'));
-$config->group->package->manageTesttask->privs['testtask-unlinkcase']       = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 7, 'depend' => array('testtask-cases'), 'recommend' => array('testtask-linkcase'));
-$config->group->package->manageTesttask->privs['testtask-runcase']          = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 9, 'depend' => array('testtask-cases'), 'recommend' => array('testtask-results'));
+$config->group->package->manageTesttask->privs['testtask-create']           = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 0,  'depend' => array(), 'recommend' => array('testtask-activate', 'testtask-block', 'testtask-close', 'testtask-edit', 'testtask-start'));
+$config->group->package->manageTesttask->privs['testtask-edit']             = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 1,  'depend' => array(), 'recommend' => array('testtask-activate', 'testtask-block', 'testtask-close', 'testtask-create', 'testtask-start'));
+$config->group->package->manageTesttask->privs['testtask-start']            = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 2,  'depend' => array(), 'recommend' => array('testtask-activate', 'testtask-block', 'testtask-close', 'testtask-create', 'testtask-edit'));
+$config->group->package->manageTesttask->privs['testtask-activate']         = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 3,  'depend' => array(), 'recommend' => array('testtask-block', 'testtask-close', 'testtask-create', 'testtask-edit', 'testtask-start'));
+$config->group->package->manageTesttask->privs['testtask-block']            = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 4,  'depend' => array(), 'recommend' => array('testtask-activate', 'testtask-close', 'testtask-create', 'testtask-edit', 'testtask-start'));
+$config->group->package->manageTesttask->privs['testtask-close']            = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 5,  'depend' => array(), 'recommend' => array('testtask-activate', 'testtask-block', 'testtask-create', 'testtask-edit', 'testtask-start'));
+$config->group->package->manageTesttask->privs['testtask-assignCase']       = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 12, 'depend' => array('testtask-cases'), 'recommend' => array());
+$config->group->package->manageTesttask->privs['testtask-batchAssign']      = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 13, 'depend' => array('testtask-cases'), 'recommend' => array());
+$config->group->package->manageTesttask->privs['testtask-linkcase']         = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 6,  'depend' => array('testtask-cases'), 'recommend' => array('testtask-unlinkcase'));
+$config->group->package->manageTesttask->privs['testtask-unlinkcase']       = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 7,  'depend' => array('testtask-cases'), 'recommend' => array('testtask-linkcase'));
+$config->group->package->manageTesttask->privs['testtask-runcase']          = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 9,  'depend' => array('testtask-cases'), 'recommend' => array('testtask-results'));
 $config->group->package->manageTesttask->privs['testtask-results']          = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 11, 'depend' => array('testtask-cases'), 'recommend' => array('testtask-runcase'));
-$config->group->package->manageTesttask->privs['testtask-batchUnlinkCases'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 8, 'depend' => array('testtask-cases'), 'recommend' => array('testtask-unlinkcase'));
+$config->group->package->manageTesttask->privs['testtask-batchUnlinkCases'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 8,  'depend' => array('testtask-cases'), 'recommend' => array('testtask-unlinkcase'));
 $config->group->package->manageTesttask->privs['testtask-batchRun']         = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 10, 'depend' => array('testtask-cases'), 'recommend' => array('testtask-runcase'));
 
 $config->group->package->deleteTesttask = new stdclass();
diff --git a/module/testtask/config.php b/module/testtask/config.php
index 0925693b11..62e1b0ddc3 100644
--- a/module/testtask/config.php
+++ b/module/testtask/config.php
@@ -22,6 +22,7 @@ $config->testtask->editor->close            = array('id' => 'report,comment', 't
 $config->testtask->editor->block            = array('id' => 'comment', 'tools' => 'simpleTools');
 $config->testtask->editor->activate         = array('id' => 'comment', 'tools' => 'simpleTools');
 $config->testtask->editor->importunitresult = array('id' => 'desc', 'tools' => 'simpleTools');
+$config->testtask->editor->assignCase       = array('id' => 'comment', 'tools' => 'simpleTools');
 
 $config->testtask->datatable = new stdclass();
 $config->testtask->datatable->defaultField = array('id', 'title', 'pri', 'assignedTo', 'openedBy', 'lastRunner', 'lastRunDate', 'lastRunResult', 'actions');
diff --git a/module/testtask/config/form.php b/module/testtask/config/form.php
index 92206b2971..702506b142 100644
--- a/module/testtask/config/form.php
+++ b/module/testtask/config/form.php
@@ -73,6 +73,11 @@ $config->testtask->form->runCase = array();
 $config->testtask->form->runCase['result'] = array('required' => true,  'type' => 'string', 'default' => '', 'base' => true);
 $config->testtask->form->runCase['real']   = array('required' => false, 'type' => 'string', 'default' => '');
 
+$config->testtask->form->assignCase = array();
+$config->testtask->form->assignCase['assignedTo'] = array('required' => false, 'type' => 'string', 'default' => '');
+$config->testtask->form->assignCase['uid']        = array('required' => false, 'type' => 'string', 'default' => '');
+$config->testtask->form->assignCase['comment']    = array('required' => false, 'type' => 'string', 'default' => '', 'control' => 'editor');
+
 $config->testtask->form->importUnitResult = array();
 $config->testtask->form->importUnitResult['execution']   = array('required' => false, 'type' => 'int',    'default' => 0);
 $config->testtask->form->importUnitResult['build']       = array('required' => true,  'type' => 'int',    'default' => '');
diff --git a/module/testtask/config/table.php b/module/testtask/config/table.php
index 85f363d769..2b57dcf84e 100644
--- a/module/testtask/config/table.php
+++ b/module/testtask/config/table.php
@@ -92,10 +92,11 @@ foreach($config->testcase->dtable->fieldList as $field => $setting)
 
     if($field == 'keywords')
     {
-        $config->testtask->cases->dtable->fieldList['assignedTo']['title'] = $lang->testcase->assignedTo;
-        $config->testtask->cases->dtable->fieldList['assignedTo']['type']  = 'user';
-        $config->testtask->cases->dtable->fieldList['assignedTo']['show']  = true;
-        $config->testtask->cases->dtable->fieldList['assignedTo']['group'] = 99; // Set a different group between testcase.
+        $config->testtask->cases->dtable->fieldList['assignedTo']['title']      = $lang->testcase->assignedTo;
+        $config->testtask->cases->dtable->fieldList['assignedTo']['type']       = 'assign';
+        $config->testtask->cases->dtable->fieldList['assignedTo']['assignLink'] = array('module' => 'testtask', 'method' => 'assignCase', 'params' => 'runID={id}');
+        $config->testtask->cases->dtable->fieldList['assignedTo']['show']       = true;
+        $config->testtask->cases->dtable->fieldList['assignedTo']['group']      = 99; // Set a different group between testcase.
     }
 }
 
diff --git a/module/testtask/lang/de.php b/module/testtask/lang/de.php
index 9f38148a80..d490af90d4 100644
--- a/module/testtask/lang/de.php
+++ b/module/testtask/lang/de.php
@@ -91,6 +91,7 @@ $lang->testtask->status            = 'Status';
 $lang->testtask->statusAB          = 'Status';
 $lang->testtask->subStatus         = 'Sub Status';
 $lang->testtask->testreport        = 'Test Report';
+$lang->testtask->assignCase        = 'Assign Testcase';
 $lang->testtask->assignedTo        = 'Zugeordnet';
 $lang->testtask->linkVersion       = 'Version';
 $lang->testtask->lastRunAccount    = 'Ausgeführt von';
diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index 6c02372136..fd90e060df 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -91,6 +91,7 @@ $lang->testtask->status            = 'Status';
 $lang->testtask->statusAB          = 'Status';
 $lang->testtask->subStatus         = 'Sub Status';
 $lang->testtask->testreport        = 'Test Report';
+$lang->testtask->assignCase        = 'Assign Testcase';
 $lang->testtask->assignedTo        = 'Assigned';
 $lang->testtask->linkVersion       = 'Build';
 $lang->testtask->lastRunAccount    = 'RunBy';
diff --git a/module/testtask/lang/fr.php b/module/testtask/lang/fr.php
index 7fb78f0090..2fdaf47943 100644
--- a/module/testtask/lang/fr.php
+++ b/module/testtask/lang/fr.php
@@ -91,6 +91,7 @@ $lang->testtask->status            = 'Statut';
 $lang->testtask->statusAB          = 'Status';
 $lang->testtask->subStatus         = 'Sous-statut';
 $lang->testtask->testreport        = 'Test Report';
+$lang->testtask->assignCase        = 'Assign Testcase';
 $lang->testtask->assignedTo        = 'Affecté';
 $lang->testtask->linkVersion       = 'Build';
 $lang->testtask->lastRunAccount    = 'Jouée par';
diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php
index 659327ce23..c90f9a38d8 100644
--- a/module/testtask/lang/zh-cn.php
+++ b/module/testtask/lang/zh-cn.php
@@ -91,6 +91,7 @@ $lang->testtask->status            = '当前状态';
 $lang->testtask->statusAB          = '状态';
 $lang->testtask->subStatus         = '子状态';
 $lang->testtask->testreport        = '相关测试报告';
+$lang->testtask->assignCase        = '指派用例';
 $lang->testtask->assignedTo        = '指派给';
 $lang->testtask->linkVersion       = '版本';
 $lang->testtask->lastRunAccount    = '执行人';