From ede99853906efce625d99e4bae815ca5c2cf33c6 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Sun, 20 Mar 2011 02:03:41 +0000
Subject: [PATCH]  * fix for bug #175

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

diff --git a/module/build/model.php b/module/build/model.php
index 91c5528866..6328d35bbf 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -46,7 +46,7 @@ class buildModel extends model
             ->leftJoin(TABLE_PRODUCT)->alias('t3')->on('t1.product = t3.id')
             ->where('t1.project')->eq((int)$projectID)
             ->andWhere('t1.deleted')->eq(0)
-            ->orderBy('t1.date DESC,t1.id desc')
+            ->orderBy('t1.date DESC , t1.id desc')
             ->fetchAll();
     }
 
@@ -69,7 +69,7 @@ class buildModel extends model
             ->where('project')->eq((int)$projectID)
             ->beginIF($productID)->andWhere('product')->eq((int)$productID)->fi()
             ->andWhere('deleted')->eq(0)
-            ->orderBy('id desc')->fetchPairs();
+            ->orderBy('date desc , id desc')->fetchPairs();
         if(!$builds) return $sysBuilds;
         $releases = $this->dao->select('build,name')->from(TABLE_RELEASE)
             ->where('build')->in(array_keys($builds))
@@ -96,7 +96,7 @@ class buildModel extends model
         $builds = $this->dao->select('id,name')->from(TABLE_BUILD)
             ->where('product')->eq((int)$productID)
             ->andWhere('deleted')->eq(0)
-            ->orderBy('id desc')->fetchPairs();
+            ->orderBy('date desc , id desc')->fetchPairs();
         if(!$builds) return $sysBuilds;
         return $sysBuilds + $builds;
     }
diff --git a/module/project/view/build.html.php b/module/project/view/build.html.php
index bf0517e5ac..137bd95838 100644
--- a/module/project/view/build.html.php
+++ b/module/project/view/build.html.php
@@ -19,6 +19,7 @@
   </caption>
   <thead>
   <tr class='colhead'>
+    <th class='w-id'><?php echo $lang->build->id;?></th>
     <th class='w-120px'><?php echo $lang->build->product;?></th>
     <th><?php echo $lang->build->name;?></th>
     <th><?php echo $lang->build->scmPath;?></th>
@@ -31,6 +32,7 @@
   <tbody>
   <?php foreach($builds as $build):?>
   <tr class='a-center'>
+    <td><?php echo $build->id;?></td>
     <td><?php echo $build->productName;?></td>
     <td class='a-left'><?php echo html::a($this->createLink('build', 'view', "build=$build->id"), $build->name);?></td>
     <td class='a-left nobr'><?php strpos($build->scmPath,  'http') === 0 ? printf(html::a($build->scmPath))  : printf($build->scmPath);?></td>