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

Merge branch 'sprint/app10'

Browse Source
This commit is contained in:
王怡栋
2021-11-25 10:25:05 +08:00
parent a83f2d8ce9 57c6ae78a8
commit 9a80f35962
25 changed files with 410 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/control.php
+5 -3
View File
@@ -1039,12 +1039,14 @@ class project extends control
/**
* Browse builds of a project.
*
* @param int $projectID
* @param string $type all|product|bysearch
* @param int $param
* @param string $orderBy
* @access public
* @return void
*/
public function build($projectID = 0, $type = 'all', $param = 0)
public function build($projectID = 0, $type = 'all', $param = 0, $orderBy = 't1.date_desc,t1.id_desc')
{
/* Load module and get project. */
$this->loadModel('build');
@@ -1071,11 +1073,11 @@ class project extends control
if($type == 'bysearch')
{
$builds = $this->build->getProjectBuildsBySearch((int)$projectID, (int)$param);
$builds = $this->build->getProjectBuildsBySearch((int)$projectID, (int)$param, $orderBy);
}
else
{
$builds = $this->build->getProjectBuilds((int)$projectID, $type, $param);
$builds = $this->build->getProjectBuilds((int)$projectID, $type, $param, $orderBy);
}
/* Set project builds. */