From c8a5eb24e4d7f64b100e40074b46bfe06b5de9ae Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Fri, 4 Dec 2020 10:19:43 +0800
Subject: [PATCH] * Fix the issue of creating build.

---
 module/build/model.php                   |  2 +-
 module/product/model.php                 |  1 -
 module/project/model.php                 |  9 ++++++++-
 module/projectbuild/control.php          |  5 ++++-
 module/projectbuild/js/browse.js         |  8 ++++++++
 module/projectbuild/lang/de.php          |  2 ++
 module/projectbuild/lang/en.php          |  2 ++
 module/projectbuild/lang/fr.php          |  2 ++
 module/projectbuild/lang/vi.php          |  2 ++
 module/projectbuild/lang/zh-cn.php       |  2 ++
 module/projectbuild/view/browse.html.php | 18 +++++++++++++++++-
 11 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/module/build/model.php b/module/build/model.php
index 17bcc745a7..aa71bdb2d9 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -149,7 +149,7 @@ class buildModel extends model
         $buildQuery = $this->session->projectBuildQuery;
 
         /* Distinguish between repeated fields. */
-        $fields = array('id' => '`id`', 'name' => '`name`', 'product' => '`product`', 'desc' => '`desc`');
+        $fields = array('id' => '`id`', 'name' => '`name`', 'product' => '`product`', 'desc' => '`desc`', 'project' => '`project`');
         foreach($fields as $field)
         {
             if(strpos($this->session->projectBuildQuery, $field) !== false)
diff --git a/module/product/model.php b/module/product/model.php
index d4fa9126e6..f4f7d669bc 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -800,7 +800,6 @@ class productModel extends model
             ->fetchAll('id');
 
         $project = $this->loadModel('program')->getPRJByID($this->session->PRJ);
-        $executionList = array('0' => '');
 
         /* The waterfall project needs to show the hierarchy and remove the parent stage. */
         if($project->model == 'waterfall')
diff --git a/module/project/model.php b/module/project/model.php
index 1a789467dd..8dca37f636 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -2941,10 +2941,12 @@ class projectModel extends model
      * @param  array  $products
      * @param  int    $queryID
      * @param  string $actionURL
+     * @param  array  $projects
+     * @param  string $type projectBuild
      * @access public
      * @return void
      */
-    public function buildProjectBuildSearchForm($products, $queryID, $actionURL)
+    public function buildProjectBuildSearchForm($products, $queryID, $actionURL, $projects = '', $type = '')
     {
         $this->loadModel('build');
 
@@ -2953,6 +2955,11 @@ class projectModel extends model
         $this->config->build->search['actionURL'] = $actionURL;
         $this->config->build->search['queryID']   = $queryID;
         $this->config->build->search['params']['product']['values'] = $products;
+        if($type == 'projectBuild')
+        {
+            $this->config->build->search['fields']['project'] = $this->lang->projectCommon;
+            $this->config->build->search['params']['project'] = array('operator' => '=', 'control' => 'select', 'values' => array('' => '') + $projects);
+        }
 
         $this->loadModel('search')->setSearchParams($this->config->build->search);
     }
diff --git a/module/projectbuild/control.php b/module/projectbuild/control.php
index 5b7b3e807b..33fc048a43 100644
--- a/module/projectbuild/control.php
+++ b/module/projectbuild/control.php
@@ -28,11 +28,13 @@ class projectBuild extends control
         $products = $this->project->getProducts($projectID, false);
         $products = array('' => '') + $products;
 
+        $projects = $this->project->getExecutionsByProject((int)$projectID, 'all', '', true);
+
         /* Build the search form. */
         $type      = strtolower($type);
         $queryID   = ($type == 'bysearch') ? (int)$param : 0; 
         $actionURL = $this->createLink('projectbuild', 'browse', "projectID=$projectID&type=bysearch&queryID=myQueryID");
-        $this->project->buildProjectBuildSearchForm($products, $queryID, $actionURL);
+        $this->project->buildProjectBuildSearchForm($products, $queryID, $actionURL, $projects, 'projectBuild');
 
         if($type == 'bysearch')
         {
@@ -62,6 +64,7 @@ class projectBuild extends control
         $this->view->product       = $type == 'product' ? $param : 'all';
         $this->view->project       = $project;
         $this->view->products      = $products;
+        $this->view->projects      = $projects;
         $this->view->type          = $type;
 
         $this->display();
diff --git a/module/projectbuild/js/browse.js b/module/projectbuild/js/browse.js
index 0803552df9..8b795f93b7 100644
--- a/module/projectbuild/js/browse.js
+++ b/module/projectbuild/js/browse.js
@@ -1,3 +1,11 @@
+$(function()
+{
+    $('#createBuildButton').on('click', function()
+    {
+        var projectID = $('#project').val();
+        parent.location.href = createLink('build', 'create', 'projectID=' + projectID);
+    })
+});
 /**
  * Change product.
  *
diff --git a/module/projectbuild/lang/de.php b/module/projectbuild/lang/de.php
index 4818eaa8dc..bd342f6371 100644
--- a/module/projectbuild/lang/de.php
+++ b/module/projectbuild/lang/de.php
@@ -1,3 +1,5 @@
 <?php
 $lang->projectbuild->common = 'Project Build';
 $lang->projectbuild->browse = 'Build List';
+
+$lang->projectbuild->project = "Please select {$lang->projectCommon}";
diff --git a/module/projectbuild/lang/en.php b/module/projectbuild/lang/en.php
index 4818eaa8dc..bd342f6371 100644
--- a/module/projectbuild/lang/en.php
+++ b/module/projectbuild/lang/en.php
@@ -1,3 +1,5 @@
 <?php
 $lang->projectbuild->common = 'Project Build';
 $lang->projectbuild->browse = 'Build List';
+
+$lang->projectbuild->project = "Please select {$lang->projectCommon}";
diff --git a/module/projectbuild/lang/fr.php b/module/projectbuild/lang/fr.php
index 4818eaa8dc..bd342f6371 100644
--- a/module/projectbuild/lang/fr.php
+++ b/module/projectbuild/lang/fr.php
@@ -1,3 +1,5 @@
 <?php
 $lang->projectbuild->common = 'Project Build';
 $lang->projectbuild->browse = 'Build List';
+
+$lang->projectbuild->project = "Please select {$lang->projectCommon}";
diff --git a/module/projectbuild/lang/vi.php b/module/projectbuild/lang/vi.php
index 4818eaa8dc..bd342f6371 100644
--- a/module/projectbuild/lang/vi.php
+++ b/module/projectbuild/lang/vi.php
@@ -1,3 +1,5 @@
 <?php
 $lang->projectbuild->common = 'Project Build';
 $lang->projectbuild->browse = 'Build List';
+
+$lang->projectbuild->project = "Please select {$lang->projectCommon}";
diff --git a/module/projectbuild/lang/zh-cn.php b/module/projectbuild/lang/zh-cn.php
index ea98d7dc92..48d0d67f57 100644
--- a/module/projectbuild/lang/zh-cn.php
+++ b/module/projectbuild/lang/zh-cn.php
@@ -1,3 +1,5 @@
 <?php
 $lang->projectbuild->common = '项目版本';
 $lang->projectbuild->browse = '版本列表';
+
+$lang->projectbuild->project = "请选择所属{$lang->projectCommon}";
diff --git a/module/projectbuild/view/browse.html.php b/module/projectbuild/view/browse.html.php
index 926848cb0e..6e33440958 100644
--- a/module/projectbuild/view/browse.html.php
+++ b/module/projectbuild/view/browse.html.php
@@ -36,7 +36,7 @@
     <p>
       <span class="text-muted"><?php echo $lang->build->noBuild;?></span>
       <?php if(common::canModify('project', $project) and common::hasPriv('build', 'create')):?>
-      <?php echo html::a($this->createLink('build', 'create', "project=$project->id"), "<i class='icon icon-plus'></i> " . $lang->build->create, '', "class='btn btn-info'");?>
+      <?php echo html::a('#projects', "<i class='icon icon-plus'></i> " . $lang->build->create, '', "data-toggle='modal' class='btn btn-info'");?>
       <?php endif;?>
     </p>
   </div>
@@ -94,4 +94,20 @@
   </div>
   <?php endif;?>
 </div>
+<div class="modal fade" id="projects">
+  <div class="modal-dialog mw-500px">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="icon icon-close"></i></button>
+        <h4 class="modal-title"><?php echo $lang->projectbuild->project;?></h4>
+      </div>
+      <div class="modal-body">
+        <div class='input-group'>
+          <?php echo html::select('projects', $projects, '', "class='form-control chosen' id=project");?>
+          <span class='input-group-btn'><?php echo html::commonButton($lang->build->create, "id='createBuildButton'", 'btn btn-primary');?></span>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
 <?php include '../../common/view/footer.html.php';?>