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/projectrelease/control.php
+3 -2
View File
@@ -62,10 +62,11 @@ class projectrelease extends control
* @param int $projectID
* @param int $executionID
* @param string $type
* @param string $orderBy
* @access public
* @return void
*/
public function browse($projectID = 0, $executionID = 0, $type = 'all')
public function browse($projectID = 0, $executionID = 0, $type = 'all', $orderBy = 't1.date_desc')
{
$this->session->set('releaseList', $this->app->getURI(true), 'project');
$project = $this->project->getById($projectID);
@@ -81,7 +82,7 @@ class projectrelease extends control
$this->view->execution = $execution;
$this->view->project = $project;
$this->view->products = $this->loadModel('product')->getProducts($projectID);
$this->view->releases = $this->projectrelease->getList($projectID, $type);
$this->view->releases = $this->projectrelease->getList($projectID, $type, $orderBy);
$this->view->projectID = $projectID;
$this->view->executionID = $executionID;
$this->view->type = $type;