From 5cb3016f3fad7950642ced16750c009edadd963c Mon Sep 17 00:00:00 2001
From: wangyuting <851424971@qq.com>
Date: Tue, 22 Nov 2022 03:01:03 +0000
Subject: [PATCH 1/5] * Finish task #77130.

---
 module/build/js/create.js          |  4 ++--
 module/build/lang/de.php           |  8 ++++----
 module/build/lang/en.php           |  8 ++++----
 module/build/lang/fr.php           |  8 ++++----
 module/build/lang/zh-cn.php        |  8 ++++----
 module/build/model.php             |  4 ++--
 module/build/view/create.html.php  |  4 ++--
 module/projectbuild/lang/zh-cn.php | 22 +++++++++++-----------
 8 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/module/build/js/create.js b/module/build/js/create.js
index c70dafe3f1..061b71b4a6 100644
--- a/module/build/js/create.js
+++ b/module/build/js/create.js
@@ -16,9 +16,9 @@ $().ready(function()
         });
     });
 
-    $('input[name=type]').change(function()
+    $('input[name=isIntegrated]').change(function()
     {
-        if($(this).val() == 'execution')
+        if($(this).val() == 'no')
         {
             $('#execution').closest('tr').show();
             $('#buildBox').closest('tr').hide();
diff --git a/module/build/lang/de.php b/module/build/lang/de.php
index b6987753bd..69448c9a5c 100644
--- a/module/build/lang/de.php
+++ b/module/build/lang/de.php
@@ -33,7 +33,7 @@ $lang->build->project        = 'Project';
 $lang->build->branch         = 'Platform/Branch';
 $lang->build->branchName     = '%s';
 $lang->build->execution      = $lang->executionCommon;
-$lang->build->type           = 'Type';
+$lang->build->integrated     = 'Integrated';
 $lang->build->builds         = 'Linked Builds';
 $lang->build->name           = 'Name';
 $lang->build->date           = 'Datum';
@@ -75,6 +75,6 @@ $lang->backhome = 'zurück';
 
 $lang->build->featureBar['browse']['all'] = 'Build List';
 
-$lang->build->typeList = array();
-$lang->build->typeList['execution'] = "{$lang->executionCommon}版本";
-$lang->build->typeList['project']   = '项目版本';
+$lang->build->isIntegrated = array();
+$lang->build->isIntegrated['no']  = 'No';
+$lang->build->isIntegrated['yes'] = 'Yes';
diff --git a/module/build/lang/en.php b/module/build/lang/en.php
index 9a1e7727cc..def8fc03ef 100644
--- a/module/build/lang/en.php
+++ b/module/build/lang/en.php
@@ -33,8 +33,8 @@ $lang->build->project        = 'Project';
 $lang->build->branch         = 'Platform/Branch';
 $lang->build->branchName     = '%s';
 $lang->build->execution      = $lang->executionCommon;
+$lang->build->integrated     = 'Integrated';
 $lang->build->builds         = 'Linked Builds';
-$lang->build->type           = 'Type';
 $lang->build->name           = 'Name';
 $lang->build->date           = 'Date';
 $lang->build->builder        = 'Builder';
@@ -75,6 +75,6 @@ $lang->backhome = 'back';
 
 $lang->build->featureBar['browse']['all'] = 'Build List';
 
-$lang->build->typeList = array();
-$lang->build->typeList['execution'] = "{$lang->executionCommon}版本";
-$lang->build->typeList['project']   = '项目版本';
+$lang->build->isIntegrated = array();
+$lang->build->isIntegrated['no']  = 'No';
+$lang->build->isIntegrated['yes'] = 'Yes';
diff --git a/module/build/lang/fr.php b/module/build/lang/fr.php
index e5e151b4e4..0b5a0b8f6b 100644
--- a/module/build/lang/fr.php
+++ b/module/build/lang/fr.php
@@ -33,7 +33,7 @@ $lang->build->project        = 'Project';
 $lang->build->branch         = 'Plateforme/Branche';
 $lang->build->branchName     = '%s';
 $lang->build->execution      = $lang->executionCommon;
-$lang->build->type           = 'Type';
+$lang->build->integrated     = 'Integrated';
 $lang->build->builds         = 'Linked Builds';
 $lang->build->name           = 'Nom';
 $lang->build->date           = 'Date';
@@ -75,6 +75,6 @@ $lang->backhome = 'Retour';
 
 $lang->build->featureBar['browse']['all'] = 'Build List';
 
-$lang->build->typeList = array();
-$lang->build->typeList['execution'] = "{$lang->executionCommon}版本";
-$lang->build->typeList['project']   = '项目版本';
+$lang->build->isIntegrated = array();
+$lang->build->isIntegrated['no']  = 'No';
+$lang->build->isIntegrated['yes'] = 'Yes';
diff --git a/module/build/lang/zh-cn.php b/module/build/lang/zh-cn.php
index 13da7f11b3..25ddaf8c0e 100644
--- a/module/build/lang/zh-cn.php
+++ b/module/build/lang/zh-cn.php
@@ -33,7 +33,7 @@ $lang->build->project        = '所属项目';
 $lang->build->branch         = '平台/分支';
 $lang->build->branchName     = '所属%s';
 $lang->build->execution      = '所属' . $lang->executionCommon;
-$lang->build->type           = '版本类型';
+$lang->build->integrated     = '集成版本';
 $lang->build->builds         = '关联版本';
 $lang->build->name           = '名称编号';
 $lang->build->date           = '打包日期';
@@ -73,6 +73,6 @@ $lang->build->action->buildopened = '$date, 由 <strong>$actor</strong> 创建
 
 $lang->backhome = '返回';
 
-$lang->build->typeList = array();
-$lang->build->typeList['execution'] = "{$lang->executionCommon}版本";
-$lang->build->typeList['project']   = '项目版本';
+$lang->build->isIntegrated = array();
+$lang->build->isIntegrated['no']  = '否';
+$lang->build->isIntegrated['yes'] = '是';
diff --git a/module/build/model.php b/module/build/model.php
index f4ab227ef9..4890255349 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -350,10 +350,10 @@ class buildModel extends model
             ->add('createdDate', helper::now())
             ->stripTags($this->config->build->editor->create['id'], $this->config->allowedTags)
             ->join('builds', ',')
-            ->remove('resolvedBy,allchecker,files,labels,type,uid')
+            ->remove('resolvedBy,allchecker,files,labels,isIntegrated,uid')
             ->get();
 
-        if($this->post->type == 'project') $build->execution = 0;
+        if($this->post->isIntegrated == 'yes') $build->execution = 0;
 
         $build = $this->loadModel('file')->processImgURL($build, $this->config->build->editor->create['id'], $this->post->uid);
         $this->dao->insert(TABLE_BUILD)->data($build)
diff --git a/module/build/view/create.html.php b/module/build/view/create.html.php
index e7b45afe8f..31c56d830a 100644
--- a/module/build/view/create.html.php
+++ b/module/build/view/create.html.php
@@ -20,8 +20,8 @@
     <form class='load-indicator main-form form-ajax' id='dataform' method='post' enctype='multipart/form-data'>
       <table class='table table-form'>
         <tr class="<?php echo ($app->tab == 'project' and !empty($multipleProject)) ? '' : 'hidden';?>">
-          <th><?php echo $lang->build->type;?></th>
-          <td><?php echo html::radio('type', $lang->build->typeList, 'execution');?></td>
+          <th><?php echo $lang->build->integrated;?></th>
+          <td><?php echo html::radio('isIntegrated', $lang->build->isIntegrated, 'no');?></td>
         </tr>
         <tr class="<?php echo !empty($multipleProject) ? '' : 'hidden';?>">
           <th><?php echo $lang->executionCommon;?></th>
diff --git a/module/projectbuild/lang/zh-cn.php b/module/projectbuild/lang/zh-cn.php
index 4140a633b1..af78f9bb44 100644
--- a/module/projectbuild/lang/zh-cn.php
+++ b/module/projectbuild/lang/zh-cn.php
@@ -11,14 +11,14 @@
  */
 $lang->projectbuild->common           = '项目版本';
 $lang->projectbuild->browse           = '版本列表';
-$lang->projectbuild->create           = "创建项目版本";
-$lang->projectbuild->edit             = "编辑项目版本";
-$lang->projectbuild->delete           = "删除版本";
-$lang->projectbuild->view             = "版本详情";
-$lang->projectbuild->linkStory        = "关联{$lang->SRCommon}";
-$lang->projectbuild->linkBug          = "关联Bug";
-$lang->projectbuild->unlinkStory      = "移除{$lang->SRCommon}";
-$lang->projectbuild->unlinkBug        = "移除Bug";
-$lang->projectbuild->batchUnlink      = '批量移除';
-$lang->projectbuild->batchUnlinkStory = "批量移除{$lang->SRCommon}";
-$lang->projectbuild->batchUnlinkBug   = '批量移除Bug';
+$lang->projectbuild->create           = "创建集成版本";
+$lang->projectbuild->edit             = "编辑集成版本";
+$lang->projectbuild->delete           = "删除集成版本";
+$lang->projectbuild->view             = "集成版本详情";
+$lang->projectbuild->linkStory        = "集成版本关联{$lang->SRCommon}";
+$lang->projectbuild->linkBug          = "集成版本关联Bug";
+$lang->projectbuild->unlinkStory      = "集成版本移除{$lang->SRCommon}";
+$lang->projectbuild->unlinkBug        = "集成版本移除Bug";
+$lang->projectbuild->batchUnlink      = '集成版本批量移除';
+$lang->projectbuild->batchUnlinkStory = "集成版本批量移除{$lang->SRCommon}";
+$lang->projectbuild->batchUnlinkBug   = '集成版本批量移除Bug';

From a04c00387d182baed6f608c3c356ebf6e34e69cf Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Tue, 22 Nov 2022 11:32:04 +0800
Subject: [PATCH 2/5] * Fixed pager jump error in the use case list.

---
 module/testcase/control.php            | 1 -
 module/testcase/js/zerocase.js         | 1 +
 module/testcase/view/zerocase.html.php | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/testcase/control.php b/module/testcase/control.php
index 749640f8c0..ecc80170e9 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -321,7 +321,6 @@ class testcase extends control
         if($this->app->tab == 'project')
         {
             $this->loadModel('project')->setMenu($this->session->project);
-            $this->app->rawModule = 'qa';
             $products  = $this->product->getProducts($this->session->project, 'all', '', false);
             $productID = $this->product->saveState($productID, $products);
             $this->lang->modulePageNav = $this->product->select($products, $productID, 'testcase', 'zeroCase', "projectID=$projectID", $branchID);
diff --git a/module/testcase/js/zerocase.js b/module/testcase/js/zerocase.js
index 618b5d612c..249058dd35 100644
--- a/module/testcase/js/zerocase.js
+++ b/module/testcase/js/zerocase.js
@@ -1,4 +1,5 @@
 $(document).ready(function()
 {
     $('#zerocaseTab').addClass('btn-active-text');
+    $('.pager').attr('data-app', tab);
 });
diff --git a/module/testcase/view/zerocase.html.php b/module/testcase/view/zerocase.html.php
index 18279dadad..58c552e04f 100644
--- a/module/testcase/view/zerocase.html.php
+++ b/module/testcase/view/zerocase.html.php
@@ -13,6 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../testcase/view/caseheader.html.php';?>
 <?php js::set('resetActive', false);?>
+<?php js::set('tab', $app->tab);?>
 <div id='mainContent' class='main-control'>
   <?php if(empty($stories)):?>
   <div class="table-empty-tip">

From 672bbadffeebb76fbb80e6ea0649fde74480b343 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Tue, 22 Nov 2022 13:18:49 +0800
Subject: [PATCH 3/5] * Removes the type prompt on the project list page name
 under the product.

---
 module/product/view/project.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/product/view/project.html.php b/module/product/view/project.html.php
index 9808ff7235..d35af0abcc 100644
--- a/module/product/view/project.html.php
+++ b/module/product/view/project.html.php
@@ -74,7 +74,7 @@
           <td class='text-left'>
             <?php
             $projectType = $project->model == 'scrum' ? 'sprint' : $project->model;
-            echo html::a($this->createLink('project', 'index', 'project=' . $project->id), "<i class='text-muted icon icon-{$projectType}'></i> " . $project->name, '', "title='{$project->name} ({$lang->project->{$project->model}})'");
+            echo html::a($this->createLink('project', 'index', 'project=' . $project->id), "<i class='text-muted icon icon-{$projectType}'></i> " . $project->name, '', "title='$project->name'");
             ?>
           </td>
           <?php if(strpos('all,undone', $status) !== false):?>

From d042a0e43744491959d088eb7df72922bb117c22 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Tue, 22 Nov 2022 13:31:20 +0800
Subject: [PATCH 4/5] * Adjust color of pri label.

---
 www/theme/default/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 3688826f8f..b845dd1cdc 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -189,7 +189,7 @@ tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline-
 .severity-issue.severity-4, .c-severity .severity-3 {color: #313C52;}
 
 .label-pri, .label-selector > .label {color: #9EA3B0; border-color: #9EA3B0;}
-.label-pri-1, .label-selector > .label-pri[data-value="1"] {color: #FF4912; border-color: #FF4912;}
+.label-pri-1, .label-selector > .label-pri[data-value="1"] {color: #FB2B2B; border-color: #FB2B2B;}
 .label-pri-2, .label-selector > .label-pri[data-value="2"] {color: #F38F19; border-color: #F38F19;}
 .label-pri-3, .label-selector > .label-pri[data-value="3"] {color: #37B2FE; border-color: #37B2FE;}
 .label-pri-4, .label-pri-5, .label-selector > .label-pri[data-value="4"], .label-selector > .label-pri[data-value="5"] {color: #9EA3B0; border-color: #9EA3B0;}

From a2d5371030f0344e7a1906182224f9e4041744bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Tue, 22 Nov 2022 13:52:06 +0800
Subject: [PATCH 5/5]  * code for task #77138,77135,77134,77133,77132,77129.

---
 module/projectrelease/lang/de.php          | 1 +
 module/projectrelease/lang/en.php          | 1 +
 module/projectrelease/lang/fr.php          | 1 +
 module/projectrelease/lang/zh-cn.php       | 1 +
 module/projectrelease/view/browse.html.php | 4 ++--
 module/projectrelease/view/create.html.php | 2 +-
 module/projectrelease/view/view.html.php   | 2 +-
 module/release/view/create.html.php        | 2 +-
 module/release/view/view.html.php          | 2 +-
 9 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/module/projectrelease/lang/de.php b/module/projectrelease/lang/de.php
index cc566da4fc..9e33efd3e3 100644
--- a/module/projectrelease/lang/de.php
+++ b/module/projectrelease/lang/de.php
@@ -27,6 +27,7 @@ $lang->projectrelease->unlinkBug        = 'Unlink Bug';
 $lang->projectrelease->export           = 'Export as HTML';
 $lang->projectrelease->browseAction     = "Release List";
 $lang->projectrelease->notify           = 'notify';
+$lang->projectrelease->product          = "Product";
 
 $lang->projectrelease->featureBar['browse']['all']       = 'All';
 $lang->projectrelease->featureBar['browse']['normal']    = 'Active';
diff --git a/module/projectrelease/lang/en.php b/module/projectrelease/lang/en.php
index a7b64180ce..74c93855ff 100644
--- a/module/projectrelease/lang/en.php
+++ b/module/projectrelease/lang/en.php
@@ -27,6 +27,7 @@ $lang->projectrelease->unlinkBug        = 'Unlink Bug';
 $lang->projectrelease->export           = 'Export as HTML';
 $lang->projectrelease->browseAction     = "Release List";
 $lang->projectrelease->notify           = 'notify';
+$lang->projectrelease->product          = "Product";
 
 $lang->projectrelease->featureBar['browse']['all']       = 'All';
 $lang->projectrelease->featureBar['browse']['normal']    = 'Active';
diff --git a/module/projectrelease/lang/fr.php b/module/projectrelease/lang/fr.php
index 3374f6d3f0..60a30d4e51 100644
--- a/module/projectrelease/lang/fr.php
+++ b/module/projectrelease/lang/fr.php
@@ -27,6 +27,7 @@ $lang->projectrelease->unlinkBug        = 'Unlink Bug';
 $lang->projectrelease->export           = 'Export HTML';
 $lang->projectrelease->browseAction     = "Release List";
 $lang->projectrelease->notify           = 'notify';
+$lang->projectrelease->product          = "Product";
 
 $lang->projectrelease->featureBar['browse']['all']       = 'All';
 $lang->projectrelease->featureBar['browse']['normal']    = 'Active';
diff --git a/module/projectrelease/lang/zh-cn.php b/module/projectrelease/lang/zh-cn.php
index 414f9d9c9c..dd0f7919aa 100644
--- a/module/projectrelease/lang/zh-cn.php
+++ b/module/projectrelease/lang/zh-cn.php
@@ -27,6 +27,7 @@ $lang->projectrelease->unlinkBug        = '移除Bug';
 $lang->projectrelease->export           = '导出HTML';
 $lang->projectrelease->browseAction     = "发布列表";
 $lang->projectrelease->notify           = "通知";
+$lang->projectrelease->product          = "所属产品";
 
 $lang->projectrelease->featureBar['browse']['all']       = '全部';
 $lang->projectrelease->featureBar['browse']['normal']    = '正常';
diff --git a/module/projectrelease/view/browse.html.php b/module/projectrelease/view/browse.html.php
index af383d90df..7a9d635c62 100644
--- a/module/projectrelease/view/browse.html.php
+++ b/module/projectrelease/view/browse.html.php
@@ -50,9 +50,9 @@
         <th class='c-id'><?php echo $lang->release->id;?></th>
         <th><?php echo $lang->release->name;?></th>
         <?php if($project->hasProduct):?>
-        <th class='c-product'><?php echo $lang->release->product;?></th>
+        <th class='c-product'><?php echo $lang->projectrelease->product;?></th>
         <?php endif;?>
-        <th class='c-build'><?php echo $lang->release->build;?></th>
+        <th class='c-build'><?php echo $lang->release->includedBuild;?></th>
         <th class='c-status text-center'><?php echo $lang->release->status;?></th>
         <th class='c-date text-center'><?php echo $lang->release->date;?></th>
         <?php
diff --git a/module/projectrelease/view/create.html.php b/module/projectrelease/view/create.html.php
index 68ec33b3eb..6464ef7beb 100644
--- a/module/projectrelease/view/create.html.php
+++ b/module/projectrelease/view/create.html.php
@@ -50,7 +50,7 @@
           </tr>
           <?php endif;?>
           <tr>
-            <th><?php echo $lang->release->build;?></th>
+            <th><?php echo $lang->release->includedBuild;?></th>
             <td id='buildBox'><?php echo html::select('build[]', $builds, '', "class='form-control chosen' multiple data-placeholder='{$lang->build->placeholder->multipleSelect}'");?></td>
             <td></td>
           </tr>
diff --git a/module/projectrelease/view/view.html.php b/module/projectrelease/view/view.html.php
index 4f8b471a9c..cb6267e017 100644
--- a/module/projectrelease/view/view.html.php
+++ b/module/projectrelease/view/view.html.php
@@ -350,7 +350,7 @@
                       <td><?php echo $release->name;?></td>
                     </tr>
                     <tr>
-                      <th><?php echo $lang->release->build;?></th>
+                      <th><?php echo $lang->release->includedBuild;?></th>
                       <td>
                         <?php
                         $buildHtml = array();
diff --git a/module/release/view/create.html.php b/module/release/view/create.html.php
index d5af839891..5f824a1c1c 100644
--- a/module/release/view/create.html.php
+++ b/module/release/view/create.html.php
@@ -34,7 +34,7 @@
             </td>
           </tr>
           <tr>
-            <th><?php echo $lang->release->build;?></th>
+            <th><?php echo $lang->release->includedBuild;?></th>
             <td><?php echo html::select('build[]', $builds, '', "class='form-control chosen' multiple data-placeholder='{$lang->build->placeholder->multipleSelect}'");?></td>
             <td></td>
           </tr>
diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php
index accbb8d1b7..00698cf074 100644
--- a/module/release/view/view.html.php
+++ b/module/release/view/view.html.php
@@ -350,7 +350,7 @@
                       <td><?php echo $release->name;?></td>
                     </tr>
                     <tr>
-                      <th><?php echo $lang->release->build;?></th>
+                      <th><?php echo $lang->release->includedBuild;?></th>
                       <td>
                         <?php
                         $buildHtml = array();