diff --git a/db/update4.1.sql b/db/update4.1.sql index fab1787663..0d913f0561 100644 --- a/db/update4.1.sql +++ b/db/update4.1.sql @@ -2,3 +2,4 @@ ALTER TABLE `zt_project` ADD `openedVersion` varchar(20) COLLATE 'utf8_general_c ALTER TABLE `zt_product` ADD `createdVersion` varchar(20) COLLATE 'utf8_general_ci' NOT NULL AFTER `createdDate`; ALTER TABLE `zt_product` DROP `order`; +ALTER TABLE `zt_project` DROP `order`; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index b5c2925bcb..a65f5cd438 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -163,7 +163,6 @@ $lang->product->menu->doc = array('link' => 'Doc|product|doc|productID=%s', $lang->product->menu->view = array('link' => 'Manage|product|view|productID=%s', 'alias' => 'edit'); $lang->product->menu->module = 'Modules|tree|browse|productID=%s&view=story'; $lang->product->menu->project = 'Projects|product|project|status=all&productID=%s'; -$lang->product->menu->order = 'Order|product|order|productID=%s'; $lang->product->menu->create = array('link' => ' New|product|create', 'float' => 'right'); $lang->product->menu->all = array('link' => ' All|product|index|locate=no&productID=%s', 'float' => 'right'); @@ -190,7 +189,6 @@ $lang->project->menu->team = array('link' => 'Team|project|team|projectID=% $lang->project->menu->doc = array('link' => 'Doc|project|doc|porjectID=%s', 'subModule' => 'doc'); $lang->project->menu->product = array('link' => 'Product|project|manageproducts|projectID=%s', 'alias' => 'edit,start,suspend,delay,close'); $lang->project->menu->view = 'Manage|project|view|projectID=%s'; -$lang->project->menu->order = 'Order|project|order|projectID=%s'; $lang->project->menu->create = array('link' => ' New|project|create', 'float' => 'right'); $lang->project->menu->all = array('link' => ' Projects|project|index|locate=no&status=all&projectID=%s', 'float' => 'right'); diff --git a/module/project/config.php b/module/project/config.php index 024e6882c6..afdbdb0d11 100644 --- a/module/project/config.php +++ b/module/project/config.php @@ -1,7 +1,7 @@ project = new stdclass(); $config->project->defaultWorkhours = 7; -$config->project->orderBy = 'isDone, `order`, status'; +$config->project->orderBy = 'isDone, status'; $config->project->maxBurnDay = '30'; global $lang, $app; diff --git a/module/project/control.php b/module/project/control.php index a972fe0318..9f7fd24f57 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -1105,28 +1105,6 @@ class project extends control } } - /** - * Order project - * - * @param int $projectID - * @access public - * @return void - */ - public function order($projectID) - { - if($_POST) - { - $this->project->saveOrder(); - die(js::reload('parent')); - } - $project = $this->commonAction($projectID); - $this->project->setMenu($this->projects, $project->id); - $this->view->title = $project->name . $this->lang->colon . $this->lang->project->order; - $this->view->projects = $this->project->getList(); - $this->view->projectID = $project->id; - $this->display(); - } - /** * Send email. * diff --git a/module/project/model.php b/module/project/model.php index f477be680d..d674ed82c8 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -199,20 +199,6 @@ class projectModel extends model return $this->session->project; } - /** - * Save order - * - * @access public - * @return void - */ - public function saveOrder() - { - foreach($_POST as $projectID => $order) - { - $this->dao->update(TABLE_PROJECT)->set('`order`')->eq($order)->where('id')->eq($projectID)->exec(); - } - } - /** * Create a project. * @@ -449,7 +435,7 @@ class projectModel extends model */ public function getPairs($mode = '') { - $orderBy = !empty($this->config->project->orderBy) ? $this->config->project->orderBy : 'isDone, `order`, status'; + $orderBy = !empty($this->config->project->orderBy) ? $this->config->project->orderBy : 'isDone, status'; $mode .= $this->cookie->projectMode; /* Order by status's content whether or not done */ $projects = $this->dao->select('*, IF(INSTR(" done", status) < 2, 0, 1) AS isDone')->from(TABLE_PROJECT) @@ -503,7 +489,7 @@ class projectModel extends model ->andWhere('t2.iscat')->eq(0) ->beginIF($status == 'undone')->andWhere('t2.status')->ne('done')->fi() ->beginIF($status != 'all' and $status != 'undone')->andWhere('status')->in($status)->fi() - ->orderBy('`order`, status') + ->orderBy('status') ->beginIF($limit)->limit($limit)->fi() ->fetchAll('id'); } @@ -530,7 +516,6 @@ class projectModel extends model $list = $this->dao->select('t1.id, t1.name,t1.status, t2.product')->from(TABLE_PROJECT)->alias('t1') ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t2')->on('t1.id = t2.project') ->where('t1.deleted')->eq(0) - ->orderBy('t1.order') ->fetchGroup('product'); $noProducts = array(); diff --git a/module/project/view/order.html.php b/module/project/view/order.html.php deleted file mode 100644 index b78bdc0634..0000000000 --- a/module/project/view/order.html.php +++ /dev/null @@ -1,55 +0,0 @@ - - * @package project - * @version $Id$ - * @link http://www.zentao.net - */ -?> - -
- - - - - - - - - - status == 'done') continue;?> - - - - - - - - -
project->unDoneProjects?>
project->id?>project->name?>project->status?>project->order?>
id?>name?>project->statusList[$project->status]?>id, $project->order, "size='5'")?>
-
-
- - - - - - - - - status != 'done') continue;?> - - - - - - - -
project->doneProjects?>
project->id?>project->name?>project->order?>
id?>name?>id, $project->order, "size='5'")?>
-
- -