From d1d444236cedd045d1130f68b83b454bc60b22b0 Mon Sep 17 00:00:00 2001
From: wangyuting <wangyuting@easycorp.ltd>
Date: Thu, 18 Jan 2024 16:38:55 +0800
Subject: [PATCH] * Add load all user to create bug page.

---
 module/bug/control.php         | 2 +-
 module/bug/ui/common.field.php | 4 ++--
 module/bug/ui/create.field.php | 3 +--
 module/bug/ui/create.html.php  | 7 ++-----
 module/bug/zen.php             | 7 ++++++-
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index 83c858bf9b..f11735dd01 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -253,7 +253,7 @@ class bug extends control
         /* 获取分支、版本、需求、项目、执行、产品、项目的模式，构造$this->view。*/
         /* Get branches, builds, stories, project, projects, executions, products, project model and build create form. */
         $this->bugZen->buildCreateForm($bug, $params, $from);
-        $this->view->loadUrl = $this->createLink('bug', 'create', "productID={product}&branch={branch}&extras=moduleID={module},projectID={project},executionID={execution},regionID={region},allBuilds={allBuilds}" . (empty($from) ? '' : "&from=$from"));
+        $this->view->loadUrl = $this->createLink('bug', 'create', "productID={product}&branch={branch}&extras=moduleID={module},projectID={project},executionID={execution},regionID={region},allBuilds={allBuilds},allUsers={allUsers}" . (empty($from) ? '' : "&from=$from"));
 
         $this->display();
     }
diff --git a/module/bug/ui/common.field.php b/module/bug/ui/common.field.php
index d34d3cfdd3..2c4e59855c 100644
--- a/module/bug/ui/common.field.php
+++ b/module/bug/ui/common.field.php
@@ -32,9 +32,9 @@ $fields->field('openedBuild')
     ->itemBegin('openedBuild[]')->control('picker')->items(data('builds'))->multiple()->itemEnd();
 
 $fields->field('assignedTo')
+    ->checkbox(array('text' => $lang->bug->loadAll, 'name' => 'allUsers', 'checked' => data('allUsers') ? true : false))
     ->control('inputGroup')
-    ->itemBegin('assignedTo')->control('picker')->items(data('productMembers'))->value(data('bug.assignedTo'))->itemEnd()
-    ->itemBegin()->control('btn')->icon('refresh text-primary')->hint($lang->bug->loadAll)->id('allUsers')->itemEnd();
+    ->itemBegin('assignedTo')->control('picker')->items(data('productMembers'))->value(data('bug.assignedTo'))->itemEnd();
 
 $fields->field('deadline')
     ->control('datePicker');
diff --git a/module/bug/ui/create.field.php b/module/bug/ui/create.field.php
index ac6df986b5..a0d15d37df 100644
--- a/module/bug/ui/create.field.php
+++ b/module/bug/ui/create.field.php
@@ -29,8 +29,7 @@ $fields->field('openedBuild')
     ->icon('plus')->text($lang->release->create)->hint($lang->release->create)
     ->url(createLink('release', 'create', 'productID=' . data('bug.productID') . '&branch=' . data('bug.branch')))
     ->className(count(data('builds')) > 1 || data('executionID') ? 'hidden' : '')
-    ->itemEnd()
-    ->itemBegin()->control('btn')->icon('refresh text-primary')->hint($lang->bug->loadAll)->itemEnd();
+    ->itemEnd();
 
 $fields->field('story')->foldable();
 
diff --git a/module/bug/ui/create.html.php b/module/bug/ui/create.html.php
index d23f5f9110..2f6f2b0a71 100644
--- a/module/bug/ui/create.html.php
+++ b/module/bug/ui/create.html.php
@@ -21,6 +21,7 @@ $fields->autoLoad('product', 'product,module,openedBuild,execution,project,story
    ->autoLoad('project', 'project,openedBuild,execution,story,task,assignedTo')
    ->autoLoad('execution', 'execution,openedBuild,story,task,assignedTo')
    ->autoLoad('allBuilds', 'openedBuild')
+   ->autoLoad('allUsers',  'assignedTo')
    ->autoLoad('region', 'lane');
 
 jsVar('bug',                   $bug);
@@ -35,9 +36,5 @@ formGridPanel
     set::title($lang->bug->create),
     set::fields($fields),
     set::fullModeOrders('module,project,execution'),
-    set::loadUrl($loadUrl),
-    on::click('#allBuilds',             'loadAllBuilds'),
-    on::click('#allUsers',              'loadAllUsers'),
-    on::click('#refreshExecutionBuild', 'refreshExecutionBuild'),
-    on::click('#refreshProductBuild',   'refreshProductBuild'),
+    set::loadUrl($loadUrl)
 );
diff --git a/module/bug/zen.php b/module/bug/zen.php
index afc0b2a91f..95dd1551c9 100644
--- a/module/bug/zen.php
+++ b/module/bug/zen.php
@@ -379,7 +379,11 @@ class bugZen extends bug
     private function getProductMembersForCreate(object $bug): array
     {
         $this->loadModel('user');
-        if($bug->executionID)
+        if(!empty($bug->allUsers))
+        {
+            $productMembers = $this->user->getPairs('devfirst|noclosed');
+        }
+        else if($bug->executionID)
         {
             $productMembers = $this->user->getTeamMemberPairs((int)$bug->executionID, 'execution');
         }
@@ -1175,6 +1179,7 @@ class bugZen extends bug
         $this->view->builds                = $bug->builds;
         $this->view->bug                   = $bug;
         $this->view->allBuilds             = !empty($bug->allBuilds) ? $bug->allBuilds : '';
+        $this->view->allUsers              = !empty($bug->allUsers)  ? $bug->allUsers  : '';
         $this->view->releasedBuilds        = $this->loadModel('release')->getReleasedBuilds($bug->productID, $bug->branch);
         $this->view->resultFiles           = !empty($resultID) && !empty($stepIdList) ? $this->loadModel('file')->getByObject('stepResult', (int)$resultID, str_replace('_', ',', $stepIdList)) : array();
         $this->view->contactList           = $this->loadModel('user')->getContactLists();