Revert " * update zui.sortable.js."

This reverts commit 875533c100.

module/common/view/sortable.html.php

@@ -26,12 +26,6 @@ $(document).ready(function()
             trigger: $tbody.find('.sort-handler').length ? '.sort-handler' : null,
             finish: function(e)
             {
-                var orders = {};
-                e.list.each(function(){
-                    var $this = $(this);
-                    orders[$this.data('id')] = parseInt($this.attr('data-order'));
-                });
-                e.orders = orders;
                 $tbody.trigger('sort.sortable', e);
                 var $thead = $tbody.closest('table').children('thead');
                 $thead.find('.headerSortDown, .headerSortUp').removeClass('headerSortDown headerSortUp').addClass('header');

module/product/view/index.html.php

@@ -36,13 +36,9 @@
     <?php $vars = "locate=no&productID=$productID&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
     <thead>
       <tr>
-<<<<<<< Updated upstream
         <?php if(strpos($orderBy, 'order') !== false):?>
         <th class='w-20px sort-default'><?php common::printOrderLink('order', $orderBy, $vars, '<i></i>');?></th>
         <?php endif;?>
-=======
-        <th class='w-20px sort-default'><?php common::printOrderLink('custom', $orderBy, $vars, '<i></i>');?></th>
->>>>>>> Stashed changes
         <th class='w-id'><?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
         <th><?php common::printOrderLink('name', $orderBy, $vars, $lang->product->name);?></th>
         <th class='w-80px'><?php echo $lang->story->statusList['active']  . $lang->story->common;?></th>
@@ -59,12 +55,8 @@
     <?php $canBatchEdit = common::hasPriv('product', 'batchEdit'); ?>
     <tbody class='sortable' id='productTableList'>
       <?php foreach($productStats as $product):?>
-<<<<<<< Updated upstream
       <tr class='text-center'>
         <?php if(strpos($orderBy, 'order') !== false):?>
-=======
-      <tr class='text-center' data-id='<?php echo $product->id ?>' data-order='<?php echo $product->id ?>'>
->>>>>>> Stashed changes
         <td class='sort-handler'><i class="icon icon-ellipsis-v"></i></td>
         <?php endif;?>
         <td>

module/project/view/index.html.php

@@ -30,13 +30,9 @@
   <?php $vars = "locate=no&status=$status&projectID=$projectID&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
   <thead>
     <tr>
-<<<<<<< Updated upstream
       <?php if(strpos($orderBy, 'order') !== false):?>
       <th class='w-20px sort-default'><?php common::printOrderLink('order', $orderBy, $vars, '<i></i>');?></th>
       <?php endif;?>
-=======
-      <th class='w-20px sort-default'><?php common::printOrderLink('custom', $orderBy, $vars, '<i></i>');?></th>
->>>>>>> Stashed changes
       <th class='w-id'><?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
       <th><?php common::printOrderLink('name', $orderBy, $vars, $lang->project->name);?></th>
       <th class='w-100px'><?php common::printOrderLink('code', $orderBy, $vars, $lang->project->code);?></th>
@@ -53,12 +49,8 @@
   <?php $canBatchEdit = common::hasPriv('project', 'batchEdit'); ?>
   <tbody class='sortable' id='projectTableList'>
   <?php foreach($projectStats as $project):?>
-<<<<<<< Updated upstream
   <tr class='text-center'>
     <?php if(strpos($orderBy, 'order') !== false):?>
-=======
-  <tr class='text-center' data-id='<?php echo $project->id ?>' data-order='<?php echo $project->id ?>'>
->>>>>>> Stashed changes
     <td class='sort-handler'><i class="icon icon-ellipsis-v"></i></td>
     <?php endif;?>
     <td>

www/upgrade.php

@@ -0,0 +1,46 @@
+<?php
+/**
+ * The upgrade router file of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv11.html)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     ZenTaoPMS
+ * @version     $Id: upgrade.php 4677 2013-04-26 06:23:58Z chencongzhi520@gmail.com $
+ * @link        http://www.zentao.net
+ */
+/* Judge my.php exists or not. */
+define('IN_UPGRADE', true);
+$myConfig = dirname(dirname(__FILE__)) . '/config/my.php';
+if(!file_exists($myConfig))
+{
+    echo "文件" . $myConfig . "不存在！ 提示：不要重命名原来的禅道安装目录，下载最新的源码包，覆盖即可。" . "<br />";
+    echo $myConfig . " doesn't exists! Please don't rename zentao before overriding the source code!";
+    exit;
+}
+
+error_reporting(0);
+
+/* Load the framework. */
+include '../framework/router.class.php';
+include '../framework/control.class.php';
+include '../framework/model.class.php';
+include '../framework/helper.class.php';
+
+/* Instance the app. */
+$app = router::createApp('pms', dirname(dirname(__FILE__)));
+$common = $app->loadCommon();
+
+/* Reset the config params to make sure the install program will be lauched. */
+$config->set('requestType', 'GET');
+$config->set('default.module', 'upgrade');
+$app->setDebug();
+
+/* Check the installed version is the latest or not. */
+$config->installedVersion = $common->loadModel('setting')->getVersion();
+if(version_compare($config->version, $config->installedVersion) <= 0) die(header('location: index.php'));
+
+/* Run it. */
+$app->parseRequest();
+$common->checkUpgradeStatus();
+$app->loadModule();