diff --git a/module/doc/model.php b/module/doc/model.php index 22fa47241a..5c346e25c4 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.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'); } diff --git a/module/mail/model.php b/module/mail/model.php index a3b23995bf..4fde24dbbf 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(); } diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php index 50c64d07df..6cbf1dbe6a 100644 --- a/module/testcase/view/caseheader.html.php +++ b/module/testcase/view/caseheader.html.php @@ -117,10 +117,18 @@ echo html::a('javascript:;', $currentLable . " ", '', "data-toggle='dropdown'"); echo "