From 205506a68a2bd0dbd1cd7fd0845ff6d61196fedc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=BB=B6=E4=B9=89?= <caoyanyi@easycorp.ltd>
Date: Sun, 9 Oct 2022 16:14:17 +0800
Subject: [PATCH] * Finish task #71891.

---
 module/projectrelease/view/browse.html.php | 8 ++++----
 module/release/view/browse.html.php        | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/module/projectrelease/view/browse.html.php b/module/projectrelease/view/browse.html.php
index 36de8640c2..895fff64f2 100644
--- a/module/projectrelease/view/browse.html.php
+++ b/module/projectrelease/view/browse.html.php
@@ -46,11 +46,11 @@
       <tr>
         <th class='c-id'><?php echo $lang->release->id;?></th>
         <th><?php echo $lang->release->name;?></th>
+        <th class='c-build'><?php echo $lang->release->build;?></th>
         <th class='c-product'><?php echo $lang->release->product;?></th>
         <th class='c-execution'><?php echo $lang->executionCommon;?></th>
-        <th class='c-build'><?php echo $lang->release->build;?></th>
-        <th class='c-date text-center'><?php echo $lang->release->date;?></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
         $extendFields = $this->projectrelease->getFlowExtendFields();
         foreach($extendFields as $extendField) echo "<th>{$extendField->name}</th>";
@@ -68,14 +68,14 @@
           echo html::a(inlink('view', "release=$release->id"), $release->name, '', "data-app='$from'") . $flagIcon;
           ?>
         </td>
+        <td title='<?php echo $release->buildName?>'><?php echo empty($release->execution) ? $release->buildName : html::a($this->createLink('build', 'view', "buildID=$release->buildID"), $release->buildName);?></td>
         <td title='<?php echo $release->productName?>'><?php echo $release->productName?></td>
         <td title='<?php echo $release->executionName?>'><?php echo $release->executionName?></td>
-        <td title='<?php echo $release->buildName?>'><?php echo empty($release->execution) ? $release->buildName : html::a($this->createLink('build', 'view', "buildID=$release->buildID"), $release->buildName);?></td>
-        <td class='text-center'><?php echo $release->date;?></td>
         <?php $status = $this->processStatus('release', $release);?>
         <td class='c-status text-center' title='<?php echo $status;?>'>
           <span class="status-release status-<?php echo $release->status?>"><?php echo $status;?></span>
         </td>
+        <td class='text-center'><?php echo $release->date;?></td>
         <?php foreach($extendFields as $extendField) echo "<td>" . $this->loadModel('flow')->getFieldValue($extendField, $release) . "</td>";?>
         <td class='c-actions'><?php echo $this->projectrelease->buildOperateMenu($release, 'browse');?></td>
       </tr>
diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php
index cccf46cd3a..e116d6c677 100644
--- a/module/release/view/browse.html.php
+++ b/module/release/view/browse.html.php
@@ -48,13 +48,13 @@
       <tr>
         <th class='c-id'><?php echo $lang->release->id;?></th>
         <th class="c-name"><?php echo $lang->release->name;?></th>
-        <th class="c-project"><?php echo $lang->release->project;?></th>
         <th class="c-build"><?php echo $lang->release->build;?></th>
         <?php if($product->type != 'normal'):?>
         <th class='text-center c-branch'><?php echo $lang->product->branch;?></th>
         <?php endif;?>
-        <th class='c-date text-center'><?php echo $lang->release->date;?></th>
+        <th class="c-project"><?php echo $lang->release->project;?></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
         $extendFields = $this->release->getFlowExtendFields();
         foreach($extendFields as $extendField) echo "<th>{$extendField->name}</th>";
@@ -73,16 +73,16 @@
           echo html::a(inlink('view', "release=$release->id"), $release->name, '', "title='$release->name'") . $flagIcon;
           ?>
         </td>
-        <td title='<?php echo $release->projectName?>'><?php echo $release->projectName;?></td>
         <td title='<?php echo $release->buildName?>'><?php echo empty($release->execution) ? $release->buildName : html::a($this->createLink('build', 'view', "buildID=$release->buildID"), $release->buildName);?></td>
         <?php if($product->type != 'normal'):?>
         <td class='text-center' title='<?php echo zget($branches, $release->branch, '');?>'><?php echo $branches[$release->branch];?></td>
         <?php endif;?>
-        <td class='text-center'><?php echo $release->date;?></td>
+        <td title='<?php echo $release->projectName?>'><?php echo $release->projectName;?></td>
         <?php $status = $this->processStatus('release', $release);?>
         <td class='c-status text-center' title='<?php echo $status;?>'>
           <span class="status-release status-<?php echo $release->status?>"><?php echo $status;?></span>
         </td>
+        <td class='text-center'><?php echo $release->date;?></td>
         <?php foreach($extendFields as $extendField) echo "<td>" . $this->loadModel('flow')->getFieldValue($extendField, $release) . "</td>";?>
         <td class='c-actions'>
           <?php echo $this->release->buildOperateMenu($release, 'browse');?>