Merge branch 'master' of github.com:easysoft/zentaopms

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.id 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.id desc')
                 ->page($pager)
                 ->fetchAll('id');
         }

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();
     }

module/testcase/view/caseheader.html.php

@@ -117,10 +117,18 @@
         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>" . $lang->testsuite->create);
+            echo '</li>';
+        }
+
         foreach ($suiteList as $suiteID => $suite)
         {
             $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);

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>