Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' into 'sprint/174_tianshujie_45081'

Browse Source 
# Conflicts:
#   module/product/control.php
#   module/story/view/batchedit.html.php
This commit is contained in:
李玉春
2021-11-29 08:03:38 +00:00
parent adb2c12935 3050ba859d
commit a99419f0c5
109 changed files with 1292 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+4 -3
View File
@@ -986,10 +986,11 @@ class execution extends control
* @param int $executionID
* @param string $type all|product|bysearch
* @param int $param
* @param string $orderBy
* @access public
* @return void
*/
public function build($executionID = 0, $type = 'all', $param = 0)
public function build($executionID = 0, $type = 'all', $param = 0, $orderBy = 't1.date_desc,t1.id_desc')
{
/* Load module and set session. */
$this->loadModel('testtask');
@@ -1015,7 +1016,7 @@ class execution extends control
}
else
{
$builds = $this->loadModel('build')->getExecutionBuilds((int)$executionID, $type, $param);
$builds = $this->loadModel('build')->getExecutionBuilds((int)$executionID, $type, $param, $orderBy);
}
/* Set execution builds. */
@@ -2515,7 +2516,7 @@ class execution extends control
if($browseType == 'bySearch')
{
$allStories = $this->story->getBySearch('', 0, $queryID, 'id', $objectID);
$allStories = $this->story->getBySearch('', '', $queryID, 'id', $objectID);
}
else
{