From 9c7e1a3dc05d30a0e73d89e1af6934170003abc8 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Fri, 27 Dec 2024 15:14:03 +0800
Subject: [PATCH] * [task#58689,done,1.5h] change hidden control to picker for
 case field.

---
 module/bug/control.php         | 6 +++---
 module/bug/ui/common.field.php | 8 +++++++-
 module/bug/ui/create.field.php | 2 ++
 module/bug/ui/edit.html.php    | 3 ++-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index d846e277cc..022e26cf0f 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -254,8 +254,8 @@ class bug extends control
         /* Handle copy bug, bug from case, testtask, todo. */
         $bug = $this->bugZen->extractObjectFromExtras($bug, $params);
 
-        /* 获取分支、版本、需求、项目、执行、产品、项目的模式，构造$this->view。*/
-        /* Get branches, builds, stories, project, projects, executions, products, project model and build create form. */
+        /* 获取分支、版本、需求、项目、执行、产品、项目的模式、用例，构造$this->view。*/
+        /* Get branches, builds, stories, project, projects, executions, products, project model, cases and build create form. */
         $this->bugZen->buildCreateForm($bug, $params, $from);
         $this->view->loadUrl = $this->createLink('bug', 'create', "productID={$productID}&branch={branch}&extras=productID={product},moduleID={module},projectID={project},executionID={execution},regionID={region},allBuilds={allBuilds},allUsers={allUsers}" . (empty($from) ? '' : "&from=$from"));
 
@@ -1587,7 +1587,7 @@ class bug extends control
     public function ajaxGetProductCases(int $productID, int $branchID = 0)
     {
         $items = array();
-        $cases = $this->loadmodel('testcase')->getPairsByProduct($productID, array(0, $branchID));
+        $cases = $this->loadModel('testcase')->getPairsByProduct($productID, array(0, $branchID));
         foreach($cases as $caseID => $caseTitle)
         {
             if(empty($caseID)) continue;
diff --git a/module/bug/ui/common.field.php b/module/bug/ui/common.field.php
index f4e1277662..eca4ebf0a3 100644
--- a/module/bug/ui/common.field.php
+++ b/module/bug/ui/common.field.php
@@ -83,6 +83,12 @@ $fields->field('files')
     ->width('full')
     ->control('fileSelector');
 
+$fields->field('case')
+    ->label($lang->bug->fromCase)
+    ->control('picker')
+    ->items(!empty(data('cases')) ? data('cases') : array())
+    ->value(data('bug.caseID'));
+
 $fields->field('story')
     ->wrapBefore()
     ->control('picker')
@@ -119,7 +125,7 @@ $fields->field('mailto')
 $fields->field('keywords')
    ->control('input');
 
-$fields->field('case')->control('hidden')->value(data('bug.caseID'));
+$fields->field('fromCase')->control('hidden')->value(data('bug.caseID'));
 $fields->field('caseVersion')->control('hidden')->value(data('bug.version'));
 $fields->field('result')->control('hidden')->value(data('bug.runID'));
 $fields->field('testtask')->control('hidden')->value(data('bug.testtask'));
diff --git a/module/bug/ui/create.field.php b/module/bug/ui/create.field.php
index 177fe172db..4e2cc0f7e1 100644
--- a/module/bug/ui/create.field.php
+++ b/module/bug/ui/create.field.php
@@ -55,6 +55,8 @@ $fields->field('files')
     ->width('full')
     ->control('fileSelector', array('defaultFiles' => $files));
 
+$fields->field('case')->foldable();
+
 $fields->field('story')->foldable();
 
 $fields->field('task')->foldable();
diff --git a/module/bug/ui/edit.html.php b/module/bug/ui/edit.html.php
index 3aac00938f..0d301ecacd 100644
--- a/module/bug/ui/edit.html.php
+++ b/module/bug/ui/edit.html.php
@@ -170,7 +170,8 @@ detailBody
                     (
                         set::name('case'),
                         set::items($cases),
-                        set::value($bug->case)
+                        set::value($bug->case),
+                        set::maxItemsCount($config->maxCount)
                     )
                 )
             ),