From b196cc21172519948c43e042a9b705d1df57d017 Mon Sep 17 00:00:00 2001
From: wangyuting <wangyuting@chandao.com>
Date: Tue, 4 Nov 2025 13:02:27 +0800
Subject: [PATCH] * [story#25787,done,0.5h,0h] Add assignedTo field.

---
 module/bug/config.php              | 4 ++--
 module/bug/config/form.php         | 1 +
 module/bug/control.php             | 2 ++
 module/bug/ui/batchcreate.html.php | 2 ++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/module/bug/config.php b/module/bug/config.php
index 94a8a70f72..f58ab26c35 100755
--- a/module/bug/config.php
+++ b/module/bug/config.php
@@ -36,11 +36,11 @@ $config->bug->list->allFields = 'id, module, execution, story, task,
 $config->bug->list->defaultFields           = 'id,title,severity,pri,openedBy,assignedTo,resolvedBy,resolution';
 $config->bug->list->customCreateFields      = 'execution,noticefeedbackBy,story,task,pri,severity,os,browser,deadline,mailto,keywords';
 $config->bug->list->customBatchEditFields   = 'type,severity,pri,productplan,assignedTo,deadline,resolvedBy,resolution,os,browser,keywords';
-$config->bug->list->customBatchCreateFields = 'project,execution,plan,steps,type,pri,deadline,severity,os,browser,keywords';
+$config->bug->list->customBatchCreateFields = 'project,execution,plan,steps,type,pri,deadline,severity,os,browser,keywords,assignedTo';
 
 $config->bug->custom = new stdclass();
 $config->bug->custom->createFields      = $config->bug->list->customCreateFields;
-$config->bug->custom->batchCreateFields = 'project,execution,deadline,steps,type,pri,severity,os,browser,%s';
+$config->bug->custom->batchCreateFields = 'project,execution,deadline,steps,type,pri,severity,os,browser,assignedTo,%s';
 $config->bug->custom->batchEditFields   = 'type,severity,pri,assignedTo,deadline,status,resolvedBy,resolution';
 
 $config->bug->exportFields = 'id, product, branch, module, project, execution, plan, story, task,
diff --git a/module/bug/config/form.php b/module/bug/config/form.php
index 12057be640..c680c69648 100644
--- a/module/bug/config/form.php
+++ b/module/bug/config/form.php
@@ -171,6 +171,7 @@ $config->bug->form->batchCreate['severity']    = array('required' => false, 'typ
 $config->bug->form->batchCreate['os']          = array('required' => false, 'type' => 'array',  'default' => '', 'filter' => 'join');
 $config->bug->form->batchCreate['browser']     = array('required' => false, 'type' => 'array',  'default' => '', 'filter' => 'join');
 $config->bug->form->batchCreate['keywords']    = array('required' => false, 'type' => 'string', 'default' => '');
+$config->bug->form->batchCreate['assignedTo']  = array('required' => false, 'type' => 'string', 'default' => '');
 
 $config->bug->form->batchEdit = array();
 $config->bug->form->batchEdit['id']             = array('required' => false, 'type' => 'int',    'base' => true);
diff --git a/module/bug/control.php b/module/bug/control.php
index bcf6b46ac3..2fa1cc29e4 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -820,6 +820,7 @@ class bug extends control
             $bugIdList = array();
             foreach($bugs as $bug)
             {
+                if(!empty($bug->assignedTo)) $bug->assignedDate = helper::now();
                 $bug->id = $this->bug->create($bug);
 
                 /* 批量创建后的一些其他操作。*/
@@ -855,6 +856,7 @@ class bug extends control
         $this->view->title    = $this->products[$productID] . $this->lang->hyphen . $this->lang->bug->batchCreate;
         $this->view->moduleID = $moduleID;
         $this->view->product  = $product;
+        $this->view->users    = $this->loadModel('user')->getPairs('noclosed');
         $this->display();
     }
 
diff --git a/module/bug/ui/batchcreate.html.php b/module/bug/ui/batchcreate.html.php
index 52c7a07f7c..9b76bd6fa1 100644
--- a/module/bug/ui/batchcreate.html.php
+++ b/module/bug/ui/batchcreate.html.php
@@ -102,6 +102,8 @@ $items[] = array('name' => 'browser', 'label' => $lang->bug->browser, 'control'
 /* Field of keywords. */
 $items[] = array('name' => 'keywords', 'label' => $lang->bug->keywords, 'width' => '200px', 'required' => isset($requiredFields['keywords']));
 
+$items[] = array('name' => 'assignedTo', 'label' => $lang->bug->assignedTo, 'control' => 'picker', 'items' => $users, 'width' => '200px');
+
 formBatchPanel
 (
     set::title($lang->bug->batchCreate),