* change for update order.

db/zentao.sql

@@ -844,6 +844,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (1, 'product', 'project'),
 (1, 'product', 'roadmap'),
 (1, 'product', 'view'),
+(1, 'product', 'updateOrder'),
 (1, 'productplan', 'batchUnlinkBug'),
 (1, 'productplan', 'batchUnlinkStory'),
 (1, 'productplan', 'browse'),
@@ -888,6 +889,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (1, 'project', 'unlinkMember'),
 (1, 'project', 'unlinkStory'),
 (1, 'project', 'view'),
+(1, 'project', 'updateOrder'),
 (1, 'qa', 'index'),
 (1, 'release', 'batchUnlinkBug'),
 (1, 'release', 'batchUnlinkStory'),
@@ -1477,6 +1479,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (4, 'project', 'unlinkMember'),
 (4, 'project', 'unlinkStory'),
 (4, 'project', 'view'),
+(4, 'project', 'updateOrder'),
 (4, 'qa', 'index'),
 (4, 'release', 'browse'),
 (4, 'release', 'export'),
@@ -1646,6 +1649,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (5, 'product', 'project'),
 (5, 'product', 'roadmap'),
 (5, 'product', 'view'),
+(5, 'product', 'updateOrder'),
 (5, 'productplan', 'batchUnlinkBug'),
 (5, 'productplan', 'batchUnlinkStory'),
 (5, 'productplan', 'browse'),
@@ -1690,6 +1694,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (5, 'project', 'unlinkMember'),
 (5, 'project', 'unlinkStory'),
 (5, 'project', 'view'),
+(5, 'project', 'updateOrder'),
 (5, 'qa', 'index'),
 (5, 'release', 'batchUnlinkBug'),
 (5, 'release', 'batchUnlinkStory'),
@@ -1902,6 +1907,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (6, 'project', 'unlinkMember'),
 (6, 'project', 'unlinkStory'),
 (6, 'project', 'view'),
+(6, 'project', 'updateOrder'),
 (6, 'qa', 'index'),
 (6, 'release', 'browse'),
 (6, 'release', 'export'),
@@ -2069,6 +2075,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (7, 'product', 'project'),
 (7, 'product', 'roadmap'),
 (7, 'product', 'view'),
+(7, 'product', 'updateOrder'),
 (7, 'productplan', 'batchUnlinkBug'),
 (7, 'productplan', 'batchUnlinkStory'),
 (7, 'productplan', 'browse'),

module/group/lang/resource.php

@@ -116,19 +116,20 @@ $lang->todo->methodOrder[40] = 'import2Today';
 
 /* Product. */
 $lang->resource->product = new stdclass();
-$lang->resource->product->index     = 'index';
-$lang->resource->product->browse    = 'browse';
-$lang->resource->product->create    = 'create';
-$lang->resource->product->view      = 'view';
-$lang->resource->product->edit      = 'edit';
-$lang->resource->product->batchEdit = 'batchEdit';
-$lang->resource->product->order     = 'order';
-$lang->resource->product->delete    = 'delete';
-$lang->resource->product->roadmap   = 'roadmap';
-$lang->resource->product->doc       = 'doc';
-$lang->resource->product->dynamic   = 'dynamic';
-$lang->resource->product->project   = 'project';
-$lang->resource->product->close     = 'close';
+$lang->resource->product->index       = 'index';
+$lang->resource->product->browse      = 'browse';
+$lang->resource->product->create      = 'create';
+$lang->resource->product->view        = 'view';
+$lang->resource->product->edit        = 'edit';
+$lang->resource->product->batchEdit   = 'batchEdit';
+$lang->resource->product->order       = 'order';
+$lang->resource->product->delete      = 'delete';
+$lang->resource->product->roadmap     = 'roadmap';
+$lang->resource->product->doc         = 'doc';
+$lang->resource->product->dynamic     = 'dynamic';
+$lang->resource->product->project     = 'project';
+$lang->resource->product->close       = 'close';
+$lang->resource->product->updateOrder = 'updateOrder';
 
 $lang->product->methodOrder[0]  = 'index';
 $lang->product->methodOrder[5]  = 'browse';
@@ -143,6 +144,7 @@ $lang->product->methodOrder[45] = 'doc';
 $lang->product->methodOrder[50] = 'dynamic';
 $lang->product->methodOrder[55] = 'project';
 $lang->product->methodOrder[60] = 'close';
+$lang->product->methodOrder[65] = 'updateOrder';
 
 /* Story. */
 $lang->resource->story = new stdclass();
@@ -275,6 +277,7 @@ $lang->resource->project->unlinkMember   = 'unlinkMember';
 $lang->resource->project->linkStory      = 'linkStory';
 $lang->resource->project->unlinkStory    = 'unlinkStory';
 $lang->resource->project->batchUnlinkStory = 'batchUnlinkStory';
+$lang->resource->project->updateOrder      = 'updateOrder';
 
 $lang->project->methodOrder[0]   = 'index';
 $lang->project->methodOrder[5]   = 'view';
@@ -309,6 +312,7 @@ $lang->project->methodOrder[145] = 'unlinkMember';
 $lang->project->methodOrder[150] = 'linkStory';
 $lang->project->methodOrder[155] = 'unlinkStory';
 $lang->project->methodOrder[160] = 'batchUnlinkStory';
+$lang->project->methodOrder[165] = 'updateOrder';
 
 /* Task. */
 $lang->resource->task = new stdclass();
@@ -1068,3 +1072,5 @@ $lang->changelog['7.2'][] = 'admin-checkWeak';
 $lang->changelog['7.2'][] = 'backup-change';
 $lang->changelog['7.2'][] = 'custom-flow';
 $lang->changelog['7.2'][] = 'group-manageView';
+$lang->changelog['7.2'][] = 'product-updateOrder';
+$lang->changelog['7.2'][] = 'project-updateOrder';

module/product/control.php

@@ -565,12 +565,12 @@ class product extends control
     }
 
     /**
-     * Ajax order.
+     * Update order.
      * 
      * @access public
      * @return void
      */
-    public function ajaxOrder()
+    public function updateOrder()
     {
         $idList   = explode(',', trim($this->post->products, ','));
         $orderBy  = $this->post->orderBy;

module/product/js/index.js

@@ -4,6 +4,6 @@ $(function()
     {
         var list = '';
         for(i = 0; i < data.list.length; i++) list += $(data.list[i]).attr('data-id') + ',';
-        $.post(createLink('product', 'ajaxOrder'), {'products' : list, 'orderBy' : orderBy});
+        $.post(createLink('product', 'updateOrder'), {'products' : list, 'orderBy' : orderBy});
     });
 });

module/product/lang/zh-cn.php

@@ -9,22 +9,23 @@
  * @version     $Id: zh-cn.php 5091 2013-07-10 06:06:46Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
-$lang->product->common    = '产品视图';
-$lang->product->index     = "产品首页";
-$lang->product->browse    = "浏览产品";
-$lang->product->dynamic   = "动态";
-$lang->product->view      = "产品概况";
-$lang->product->edit      = "编辑产品";
-$lang->product->batchEdit = "批量编辑";
-$lang->product->create    = "新增产品";
-$lang->product->read      = "产品详情";
-$lang->product->delete    = "删除产品";
-$lang->product->deleted   = "已删除";
-$lang->product->close     = "关闭";
-$lang->product->select    = '--请选择产品--';
-$lang->product->mine      = '我负责：';
-$lang->product->other     = '其他：';
-$lang->product->closed    = '已关闭';
+$lang->product->common      = '产品视图';
+$lang->product->index       = "产品首页";
+$lang->product->browse      = "浏览产品";
+$lang->product->dynamic     = "动态";
+$lang->product->view        = "产品概况";
+$lang->product->edit        = "编辑产品";
+$lang->product->batchEdit   = "批量编辑";
+$lang->product->create      = "新增产品";
+$lang->product->read        = "产品详情";
+$lang->product->delete      = "删除产品";
+$lang->product->deleted     = "已删除";
+$lang->product->close       = "关闭";
+$lang->product->select      = '--请选择产品--';
+$lang->product->mine        = '我负责：';
+$lang->product->other       = '其他：';
+$lang->product->closed      = '已关闭';
+$lang->product->updateOrder = "排序";
 
 $lang->product->basicInfo = '基本信息';
 $lang->product->otherInfo = '其他信息';

module/product/view/index.html.php

@@ -31,6 +31,7 @@
   </div>
 </div>
 <?php else:?>
+<?php $canOrder = (common::hasPriv('product', 'updateOrder') and strpos($orderBy, 'order') !== false)?>
 <form method='post' action='<?php echo inLink('batchEdit', "productID=$productID");?>'>
   <table class='table table-condensed table-hover table-striped tablesorter'>
     <?php $vars = "locate=no&productID=$productID&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
@@ -47,7 +48,9 @@
         <th class='w-80px'><?php echo $lang->product->bugs;?></th>
         <th class='w-80px'><?php echo $lang->bug->unResolved;?></th>
         <th class='w-80px'><?php echo $lang->bug->assignToNull;?></th>
-        <th class='w-30px sort-default'><?php common::printOrderLink('order', $orderBy, $vars, '<i></i>');?></th>
+        <?php if($canOrder):?>
+        <th class='w-60px sort-default'><?php common::printOrderLink('order', $orderBy, $vars, $lang->product->updateOrder);?></th>
+        <?php endif;?>
       </tr>
     </thead>
     <?php $canBatchEdit = common::hasPriv('product', 'batchEdit'); ?>
@@ -70,19 +73,22 @@
         <td><?php echo $product->bugs?></td>
         <td><?php echo $product->unResolved;?></td>
         <td><?php echo $product->assignToNull;?></td>
+        <?php if($canOrder):?>
         <td class='sort-handler'><i class="icon icon-move"></i></td>
+        <?php endif;?>
       </tr>
       <?php endforeach;?>
     </tbody>
     <tfoot>
       <tr>
-        <td colspan='<?php echo strpos($orderBy, 'order') !== false ? 12 : 11?>'>
-          <?php if($canBatchEdit and !empty($productStats)):?>
+        <td colspan='<?php echo $canOrder ? 12 : 11?>'>
           <div class='table-actions clearfix'>
+            <?php if($canBatchEdit and !empty($productStats)):?>
             <?php echo "<div class='btn-group'>" . html::selectButton() . '</div>';?>
             <?php echo html::submitButton($lang->product->batchEdit, '', '');?>
+            <?php endif;?>
+            <?php if(!$canOrder and common::hasPriv('product', 'updateOrder')) echo html::a(inlink('index', "locate=no&productID=$productID&order=order_desc&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"), $lang->project->updateOrder);?>
           </div>
-          <?php endif;?>
           <div class='text-right'><?php $pager->show();?></div>
         </td>
       </tr>

module/project/control.php

@@ -1728,12 +1728,12 @@ class project extends control
     }
 
     /**
-     * Ajax order.
+     * Update order.
      * 
      * @access public
      * @return void
      */
-    public function ajaxOrder()
+    public function updateOrder()
     {
         $idList   = explode(',', trim($this->post->projects, ','));
         $orderBy  = $this->post->orderBy;

module/project/js/index.js

@@ -4,7 +4,7 @@ $(function()
     {
         var list = '';
         for(i = 0; i < data.list.length; i++) list += $(data.list[i]).attr('data-id') + ',';
-        $.post(createLink('project', 'ajaxOrder'), {'projects' : list, 'orderBy' : orderBy});
+        $.post(createLink('project', 'updateOrder'), {'projects' : list, 'orderBy' : orderBy});
     });
 });
 

module/project/lang/en.php

@@ -62,6 +62,7 @@ $lang->project->typeDesc      = 'No burndown and story in OPS';
 $lang->project->mine          = 'I charge : ';
 $lang->project->other         = 'Other : ';
 $lang->project->deleted       = 'Deleted';
+$lang->project->updateOrder   = 'Order';
 
 $lang->project->start    = 'Start';
 $lang->project->activate = 'Activate';

module/project/lang/zh-cn.php

@@ -62,6 +62,7 @@ $lang->project->typeDesc      = '运维项目禁用燃尽图和需求。';
 $lang->project->mine          = '我负责：';
 $lang->project->other         = '其他：';
 $lang->project->deleted       = '已删除';
+$lang->project->updateOrder   = '排序';
 
 $lang->project->start    = '开始';
 $lang->project->activate = '激活';

module/project/view/index.html.php

@@ -26,6 +26,7 @@
     <?php echo "<li>" . html::select('product', $products, $productID, "class='chosen' onchange='byProduct(this.value, $projectID)'") . '</li>';?>
   </ul>
 </div>
+<?php $canOrder = (common::hasPriv('project', 'updateOrder') and strpos($orderBy, 'order') !== false)?>
 <form class='form-condensed' method='post' action='<?php echo inLink('batchEdit', "projectID=$projectID");?>'>
 <table class='table table-fixed tablesorter'>
   <?php $vars = "locate=no&status=$status&projectID=$projectID&orderBy=%s&productID=$productID&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
@@ -42,7 +43,9 @@
       <th class='w-70px'><?php echo $lang->project->totalLeft;?></th>
       <th class='w-150px'><?php echo $lang->project->progess;?></th>
       <th class='w-100px'><?php echo $lang->project->burn;?></th>
-      <th class='w-30px sort-default'><?php common::printOrderLink('order', $orderBy, $vars, '<i></i>');?></th>
+      <?php if($canOrder):?>
+      <th class='w-60px sort-default'><?php common::printOrderLink('order', $orderBy, $vars, $lang->project->updateOrder);?></th>
+      <?php endif;?>
     </tr>
   </thead>
   <?php $canBatchEdit = common::hasPriv('project', 'batchEdit'); ?>
@@ -68,19 +71,22 @@
       <small><?php echo $project->hours->progress;?>%</small>
     </td>
     <td class='projectline text-left' values='<?php echo join(',', $project->burns);?>'></td>
+    <?php if($canOrder):?>
     <td class='sort-handler'><i class="icon icon-move"></i></td>
+    <?php endif;?>
   </tr>
   <?php endforeach;?>
   </tbody>
   <tfoot>
     <tr>
-      <td colspan='<?php echo strpos($orderBy, 'order') !== false ? 12 : 11?>'>
-        <?php if($canBatchEdit and !empty($projectStats)):?>
+      <td colspan='<?php echo $canOrder ? 12 : 11?>'>
         <div class='table-actions clearfix'>
-        <?php echo "<div class='btn-group'>" . html::selectButton() . '</div>';?>
-        <?php echo html::submitButton($lang->project->batchEdit);?>
+          <?php if($canBatchEdit and !empty($projectStats)):?>
+          <?php echo "<div class='btn-group'>" . html::selectButton() . '</div>';?>
+          <?php echo html::submitButton($lang->project->batchEdit);?>
+          <?php endif;?>
+          <?php if(!$canOrder and common::hasPriv('project', 'updateOrder')) echo html::a(inlink('index', "locate=no&status=$status&projectID=$projectID&order=order_desc&productID=$productID&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"), $lang->project->updateOrder, '', "class='btn'");?>
         </div>
-        <?php endif;?>
         <div class='text-right'><?php $pager->show();?></div>
       </td>
     </tr>

module/project/view/story.html.php

@@ -136,7 +136,7 @@
                     $misc       = "onclick=\"setFormAction('$actionLink')\"";
                     echo '<li>' . html::a('#', $lang->close, '', $misc) . '</li>';
                 }
-                if(common::hasPriv('story', 'batchUnlinkStory'))
+                if(common::hasPriv('project', 'batchUnlinkStory'))
                 {
                     $actionLink = $this->createLink('project', 'batchUnlinkStory', "projectID=$project->id");
                     $misc       = "onclick=\"setFormAction('$actionLink')\"";