From fdfe48a9044854f72c0dfda24c7dfc4dd4f6e0e6 Mon Sep 17 00:00:00 2001
From: pengjiangxiu <riverdream@yeah.net>
Date: Fri, 11 Aug 2017 15:03:38 +0800
Subject: [PATCH 1/4] * Finish task #3165.

---
 module/testcase/view/caseheader.html.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php
index 50c64d07df..b2c7ee9879 100644
--- a/module/testcase/view/caseheader.html.php
+++ b/module/testcase/view/caseheader.html.php
@@ -117,6 +117,13 @@
         echo html::a('javascript:;', $currentLable . " <span class='caret'></span>", '', "data-toggle='dropdown'");
         echo "<ul class='dropdown-menu' style='max-height:240px; overflow-y:auto'>";
 
+        if(empty($suiteList)) 
+        {
+            echo '<li>';
+            echo html::a($this->createLink('testsuite', 'create', "productID=$productID"), "<i class='icon-plus'></i>" . '建套件');
+            echo '</li>';
+        }
+
         foreach ($suiteList as $suiteID => $suite)
         {
             $suiteName = $suite->name;

From 3953a542fc941a84fa5f89134bbfe151a17f4708 Mon Sep 17 00:00:00 2001
From: pengjiangxiu <riverdream@yeah.net>
Date: Fri, 11 Aug 2017 15:19:10 +0800
Subject: [PATCH 2/4] * Finish task #3164.

---
 module/testcase/view/caseheader.html.php | 3 ++-
 module/testsuite/view/browse.html.php    | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php
index b2c7ee9879..6cbf1dbe6a 100644
--- a/module/testcase/view/caseheader.html.php
+++ b/module/testcase/view/caseheader.html.php
@@ -120,7 +120,7 @@
         if(empty($suiteList)) 
         {
             echo '<li>';
-            echo html::a($this->createLink('testsuite', 'create', "productID=$productID"), "<i class='icon-plus'></i>" . '建套件');
+            echo html::a($this->createLink('testsuite', 'create', "productID=$productID"), "<i class='icon-plus'></i>" . $lang->testsuite->create);
             echo '</li>';
         }
 
@@ -128,6 +128,7 @@
         {
             $suiteName = $suite->name;
             if($suite->type == 'public') $suiteName .= " <span class='label label-info'>{$lang->testsuite->authorList[$suite->type]}</span>";
+            if($suite->type == 'private') $suiteName .= " <span class='label label-warning'>{$lang->testsuite->authorList[$suite->type]}</span>";
 
             echo '<li' . ($suiteID == (int)$currentSuiteID ? " class='active'" : '') . '>';
             echo html::a($this->createLink('testcase', 'browse', "productID=$productID&branch=$branch&browseType=bySuite&param=$suiteID"), $suiteName);
diff --git a/module/testsuite/view/browse.html.php b/module/testsuite/view/browse.html.php
index e9fde7a2c4..5ee5104c39 100644
--- a/module/testsuite/view/browse.html.php
+++ b/module/testsuite/view/browse.html.php
@@ -37,6 +37,7 @@
     <td><?php echo sprintf('%03d', $suite->id);?></td>
     <td class='text-left' title="<?php echo $suite->name?>">
       <?php if($suite->type == 'public') echo "<span class='label label-info'>{$lang->testsuite->authorList['public']}</span> ";?>
+      <?php if($suite->type == 'private') echo "<span class='label label-warning'>{$lang->testsuite->authorList['private']}</span> ";?>
       <?php echo html::a(inlink('view', "suiteID=$suite->id"), $suite->name);?>
     </td>
     <td><?php echo $suite->desc;?></td>

From fdd13c22975a3b9c32d29dd2914b3bd4f8856237 Mon Sep 17 00:00:00 2001
From: pengjiangxiu <riverdream@yeah.net>
Date: Fri, 11 Aug 2017 15:40:54 +0800
Subject: [PATCH 3/4] * Finish task #3122.

---
 module/doc/model.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/module/doc/model.php b/module/doc/model.php
index 22fa47241a..f0e0631b0d 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -936,6 +936,7 @@ class docModel extends model
                 ->orWhere("(objectType = 'productplan' and objectID in ($planIdList))")
                 ->markRight(1)
                 ->beginIF($searchTitle)->andWhere('title')->like("%{$searchTitle}%")->fi()
+                ->orderBy('t1.addedDate desc')
                 ->page($pager)
                 ->fetchAll('id');
         }
@@ -951,6 +952,7 @@ class docModel extends model
                 ->orWhere("(objectType = 'build' and objectID in ($buildIdList))")
                 ->markRight(1)
                 ->beginIF($searchTitle)->andWhere('title')->like("%{$searchTitle}%")->fi()
+                ->orderBy('t1.addedDate desc')
                 ->page($pager)
                 ->fetchAll('id');
         }

From dccebc7b9a955cca607692764a826208fbd78397 Mon Sep 17 00:00:00 2001
From: pengjiangxiu <riverdream@yeah.net>
Date: Mon, 14 Aug 2017 09:56:39 +0800
Subject: [PATCH 4/4] * Finish task #3119.

---
 module/doc/model.php  | 4 ++--
 module/mail/model.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/doc/model.php b/module/doc/model.php
index f0e0631b0d..5c346e25c4 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -936,7 +936,7 @@ class docModel extends model
                 ->orWhere("(objectType = 'productplan' and objectID in ($planIdList))")
                 ->markRight(1)
                 ->beginIF($searchTitle)->andWhere('title')->like("%{$searchTitle}%")->fi()
-                ->orderBy('t1.addedDate desc')
+                ->orderBy('t1.id desc')
                 ->page($pager)
                 ->fetchAll('id');
         }
@@ -952,7 +952,7 @@ class docModel extends model
                 ->orWhere("(objectType = 'build' and objectID in ($buildIdList))")
                 ->markRight(1)
                 ->beginIF($searchTitle)->andWhere('title')->like("%{$searchTitle}%")->fi()
-                ->orderBy('t1.addedDate desc')
+                ->orderBy('t1.id desc')
                 ->page($pager)
                 ->fetchAll('id');
         }
diff --git a/module/mail/model.php b/module/mail/model.php
index 1cb6b912fa..ba006f17e4 100644
--- a/module/mail/model.php
+++ b/module/mail/model.php
@@ -517,7 +517,7 @@ class mailModel extends model
         $data->ccList    = $ccList;
         $data->subject   = $subject;
         $data->body      = $body;
-        $data->addedBy   = $this->app->user->account;
+        $data->addedBy   = $this->config->mail->fromName;
         $data->addedDate = helper::now();
         $this->dao->insert(TABLE_MAILQUEUE)->data($data)->autocheck()->exec();
     }