From 167ba07155ef2120189f80de261e3ca0402be07b Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Fri, 25 Dec 2020 16:11:17 +0800
Subject: [PATCH] * Put the sort in the operation.

---
 module/product/js/all.js         |  1 +
 module/product/view/all.html.php | 14 +++++---------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/module/product/js/all.js b/module/product/js/all.js
index 58686a872e..8cdfe4b64e 100644
--- a/module/product/js/all.js
+++ b/module/product/js/all.js
@@ -4,6 +4,7 @@ $(function()
     var $list = $('#productTableList');
     $list.addClass('sortable').sortable(
     {
+        reverse: orderBy === 'order_desc',
         selector: 'tr',
         dragCssClass: 'drag-row',
         trigger: $list.find('.sort-handler').length ? '.sort-handler' : null,
diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php
index b3ce3e5fa4..fd8775fad8 100644
--- a/module/product/view/all.html.php
+++ b/module/product/view/all.html.php
@@ -45,10 +45,7 @@
             <th class="w-150px" colspan="2"><?php echo $lang->bug->common;?></th>
             <th class="w-80px"  rowspan="2"><?php echo $lang->product->release;?></th>
             <th class="w-80px"  rowspan="2"><?php echo $lang->product->plan;?></th>
-            <?php if($canOrder):?>
-            <th class='w-70px sort-default' rowspan="2"><?php common::printOrderLink('order', $orderBy, $vars, $lang->product->updateOrder);?></th>
-            <?php endif;?>
-            <th class='c-actions w-60px' rowspan="2"><?php echo $lang->actions;?></th>
+            <th class='c-actions w-70px' rowspan="2"><?php echo $lang->actions;?></th>
           </tr>
           <tr class="text-center">
             <th style="border-left: 1px solid #ddd;"><?php echo $lang->story->activate;?></th>
@@ -89,7 +86,6 @@
           <td></td>
           <td></td>
           <td></td>
-          <td></td>
         </tr>
         <?php endif;?>
         <?php foreach($program->products as $product):?>
@@ -127,11 +123,11 @@
           <td><?php echo $product->closedBugs;?></td>
           <td><?php echo $product->releases;?></td>
           <td><?php echo $product->plans;?></td>
-          <?php if($canOrder):?>
-          <td class='c-actions sort-handler'><i class="icon icon-move"></i></td>
-          <?php endif;?>
-          <td class='c-actions'>
+          <td class='c-actions sort-handler'>
             <?php common::printIcon('product', 'edit', "product=$product->id", $product, 'list', 'edit');?>
+            <?php if($canOrder):?>
+            <i class="icon icon-move"></i>
+            <?php endif;?>
           </td>
         </tr>
         <?php endforeach;?>