From b617d40d519c24f05390b62a4e902ea3ae42287a Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Wed, 22 Feb 2012 08:02:29 +0000
Subject: [PATCH]  * adjust order of project and product.

---
 module/product/view/order.html.php | 2 +-
 module/project/model.php           | 2 +-
 module/project/view/order.html.php | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/module/product/view/order.html.php b/module/product/view/order.html.php
index e7e970b9c9..dd0c448d41 100644
--- a/module/product/view/order.html.php
+++ b/module/product/view/order.html.php
@@ -21,7 +21,7 @@
   <?php foreach($products as $product):?>
   <tr class='a-center'>
     <td><?php echo $product->id?></td>
-    <td><?php echo $product->name?></td>
+    <td class='a-left'><?php echo $product->name?></td>
     <td><?php echo html::input($product->id, $product->order, "size='5'")?></td>
   </tr>
   <?php endforeach;?>
diff --git a/module/project/model.php b/module/project/model.php
index 27134f4671..d8c799ae0f 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -309,7 +309,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($this->config->project->orderBy)
+                ->orderBy('`order`, status')
                 ->beginIF($limit)->limit($limit)->fi()
                 ->fetchAll('id');
         }
diff --git a/module/project/view/order.html.php b/module/project/view/order.html.php
index 3bc8240735..0ee09e24ea 100644
--- a/module/project/view/order.html.php
+++ b/module/project/view/order.html.php
@@ -14,7 +14,7 @@
 <form method='post' target='hiddenwin'>
 <table align='center' class='table-5'>
   <caption><?php echo $lang->project->statusUndone?></caption>
-  <tr class='colhead'>
+  <tr>
     <th class='w-80px'><?php echo $lang->project->id?></th>
     <th><?php echo $lang->project->name?></th>
     <th class='w-80px'><?php echo $lang->project->status?></th>
@@ -24,7 +24,7 @@
   <?php if($project->status == 'done') continue;?>
   <tr class='a-center'>
     <td><?php echo $project->id?></td>
-    <td><?php echo $project->name?></td>
+    <td class='a-left'><?php echo $project->name?></td>
     <td><?php echo $lang->project->statusList[$project->status]?></td>
     <td><?php echo html::input($project->id, $project->order, "size='5'")?></td>
   </tr>
@@ -35,7 +35,7 @@
 <form method='post' target='hiddenwin'>
 <table align='center' class='table-5'>
   <caption><?php echo $lang->project->statusDone?></caption>
-  <tr class='colhead'>
+  <tr>
     <th class='w-80px'><?php echo $lang->project->id?></th>
     <th><?php echo $lang->project->name?></th>
     <th class='w-80px'><?php echo $lang->project->order?></th>
@@ -44,7 +44,7 @@
   <?php if($project->status != 'done') continue;?>
   <tr class='a-center'>
     <td><?php echo $project->id?></td>
-    <td><?php echo $project->name?></td>
+    <td class='a-left'><?php echo $project->name?></td>
     <td><?php echo html::input($project->id, $project->order, "size='5'")?></td>
   </tr>
   <?php endforeach;?>