From cc12e457555fda0eb52c217292062c48bca9f010 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Tue, 15 Nov 2022 08:26:43 +0000
Subject: [PATCH] g * Adjust import release list.

---
 module/kanban/css/importrelease.css       |  2 ++
 module/kanban/view/importrelease.html.php | 32 ++++++++++++++---------
 module/release/lang/de.php                |  2 ++
 module/release/lang/en.php                |  2 ++
 module/release/lang/fr.php                |  2 ++
 module/release/lang/zh-cn.php             |  2 ++
 module/release/view/browse.html.php       |  4 +--
 7 files changed, 32 insertions(+), 14 deletions(-)
 create mode 100644 module/kanban/css/importrelease.css

diff --git a/module/kanban/css/importrelease.css b/module/kanban/css/importrelease.css
new file mode 100644
index 0000000000..d0ac33b985
--- /dev/null
+++ b/module/kanban/css/importrelease.css
@@ -0,0 +1,2 @@
+#releaseList > tbody > tr:hover{background-color: unset!important;}
+#product_chosen {width: 45% !important}
diff --git a/module/kanban/view/importrelease.html.php b/module/kanban/view/importrelease.html.php
index c8e5bf342a..16f838c13f 100644
--- a/module/kanban/view/importrelease.html.php
+++ b/module/kanban/view/importrelease.html.php
@@ -33,7 +33,7 @@
   </div>
   <?php if($releases2Imported):?>
   <form class='main-table' method='post' data-ride='table' target='hiddenwin' id='importReleaseForm'>
-    <table class='table table-fixed' id='releaseList'>
+    <table class='table table-bordered table-fixed' id='releaseList'>
       <thead>
         <tr>
           <th class="c-id">
@@ -43,32 +43,41 @@
             <?php echo $lang->idAB;?>
           </th>
           <th class='c-name'><?php echo $lang->release->name;?></th>
-          <th class='c-name'><?php echo $lang->release->project;?></th>
-          <th class='c-name'><?php echo $lang->release->build;?></th>
+          <th class='c-name'><?php echo $lang->release->includedBuild;?></th>
+          <th class='c-name'><?php echo $lang->release->relatedProject;?></th>
           <th class='c-date'><?php echo $lang->release->date;?></th>
         </tr>
       </thead>
       <tbody>
         <?php foreach($releases2Imported as $release):?>
+        <?php $i = 1;?>
+        <?php $buildCount = count($release->builds);?>
+        <?php foreach($release->builds as $build):?>
         <tr>
-          <td class='c-id'>
+          <?php if($i == 1):?>
+          <td rowspan="<?php echo $buildCount;?>" class='c-id'>
             <div class="checkbox-primary">
               <input type='checkbox' name='releases[]' value='<?php echo $release->id;?>'/>
               <label></label>
             </div>
             <?php printf('%03d', $release->id);?>
           </td>
-          <?php if(common::hasPriv('release', 'view')):?>
-          <td title='<?php echo $release->name;?>'>
+          <td rowspan="<?php echo $buildCount;?>" title='<?php echo $release->name;?>'>
+            <?php if(common::hasPriv('release', 'view')):?>
             <a href='javascript:void(0);' onclick="locateView('release', <?php echo $release->id;?>)"><?php echo $release->name;?></a>
+            <?php else:?>
+            <?php echo $release->name;?>
+            <?php endif;?>
           </td>
-          <?php else:?>
-          <td title='<?php echo $release->name;?>'><?php echo $release->name;?></td>
           <?php endif;?>
-          <td title='<?php echo $release->projectName;?>'><?php echo $release->projectName;?></td>
-          <td title='<?php echo $release->buildName;?>'><?php echo $release->buildName;?></td>
-          <td title='<?php echo $release->date;?>'><?php echo $release->date;?></td>
+          <td title='<?php echo $build->name;?>'><?php echo $build->name;?></td>
+          <td title='<?php echo $build->projectName;?>'><?php echo $build->projectName;?></td>
+          <?php if($i == 1):?>
+          <td rowspan="<?php echo $buildCount;?>" title='<?php echo $release->date;?>'><?php echo $release->date;?></td>
+          <?php endif;?>
         </tr>
+        <?php $i++;?>
+        <?php endforeach;?>
         <?php endforeach;?>
         <tr><?php echo html::hidden('targetLane', key($lanePairs));?></tr>
       </tbody>
@@ -83,5 +92,4 @@
   <div class='table-empty-tip'><?php echo $lang->noData;?></div>
   <?php endif;?>
 </div>
-<style>#product_chosen {width: 45% !important}</style>
 <?php include '../../common/view/footer.lite.html.php';?>
diff --git a/module/release/lang/de.php b/module/release/lang/de.php
index 5b9df0f6a5..81723c68b5 100644
--- a/module/release/lang/de.php
+++ b/module/release/lang/de.php
@@ -38,6 +38,8 @@ $lang->release->product        = $lang->productCommon;
 $lang->release->branch         = 'Platform/Branch';
 $lang->release->project        = 'Project';
 $lang->release->build          = 'Build';
+$lang->release->includedBuild  = 'Included Build';
+$lang->release->relatedProject = 'Related Project';
 $lang->release->name           = 'Name';
 $lang->release->marker         = 'Meilensteine';
 $lang->release->date           = 'Datum';
diff --git a/module/release/lang/en.php b/module/release/lang/en.php
index 14f54db539..c480cbd021 100644
--- a/module/release/lang/en.php
+++ b/module/release/lang/en.php
@@ -39,6 +39,8 @@ $lang->release->product        = $lang->productCommon;
 $lang->release->branch         = 'Platform/Branch';
 $lang->release->project        = 'Project';
 $lang->release->build          = 'Build';
+$lang->release->includedBuild  = 'Included Build';
+$lang->release->relatedProject = 'Related Project';
 $lang->release->name           = 'Name';
 $lang->release->marker         = 'Milestone';
 $lang->release->date           = 'Release Date';
diff --git a/module/release/lang/fr.php b/module/release/lang/fr.php
index 1f5dbdf9e1..c27bfe6121 100644
--- a/module/release/lang/fr.php
+++ b/module/release/lang/fr.php
@@ -38,6 +38,8 @@ $lang->release->product        = $lang->productCommon;
 $lang->release->branch         = 'Plateforme/Branche';
 $lang->release->project        = 'Project';
 $lang->release->build          = 'Build';
+$lang->release->includedBuild  = 'Included Build';
+$lang->release->relatedProject = 'Related Project';
 $lang->release->name           = 'Nom';
 $lang->release->marker         = 'Etape Importante';
 $lang->release->date           = 'Date Release';
diff --git a/module/release/lang/zh-cn.php b/module/release/lang/zh-cn.php
index 6689db4489..57af6338f2 100644
--- a/module/release/lang/zh-cn.php
+++ b/module/release/lang/zh-cn.php
@@ -39,6 +39,8 @@ $lang->release->product        = $lang->productCommon;
 $lang->release->branch         = '平台/分支';
 $lang->release->project        = '所属项目';
 $lang->release->build          = '版本';
+$lang->release->includedBuild  = '包含版本';
+$lang->release->relatedProject = '对应项目';
 $lang->release->name           = '发布名称';
 $lang->release->marker         = '里程碑';
 $lang->release->date           = '发布日期';
diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php
index 3162da013b..b78e2b51fc 100644
--- a/module/release/view/browse.html.php
+++ b/module/release/view/browse.html.php
@@ -51,8 +51,8 @@
       <tr>
         <th class='c-id'><?php echo $lang->release->id;?></th>
         <th class="c-name"><?php echo $lang->release->name;?></th>
-        <th class='text-center c-build'><?php echo $lang->release->build;?></th>
-        <th class='text-center c-project'><?php echo $lang->release->project;?></th>
+        <th class='text-center c-build'><?php echo $lang->release->includedBuild;?></th>
+        <th class='text-center c-project'><?php echo $lang->release->relatedProject;?></th>
         <th class='text-center c-status'><?php echo $lang->release->status;?></th>
         <th class='c-date text-center'><?php echo $lang->release->date;?></th>
         <?php