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

Merge branch 'pailei2_zhouxin_fixbugs' into 'pailei2'

Browse Source 
Pailei2 zhouxin fixbugs

See merge request easycorp/zentaopms!2375
This commit is contained in:
李玉春
2022-03-18 09:11:32 +00:00
parent 09ac8ec0f8 6dc51aafc0
commit f935639cb8
7 changed files with 136 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+3
View File
@@ -1317,6 +1317,7 @@ class execution extends control
$this->view->title = $this->lang->execution->tips;
$this->view->tips = $this->fetch('execution', 'tips', "executionID=$executionID");
$this->view->defaultURL = isset($this->session->closeTipsList) ? $this->session->closeTipsList : $this->createLink('execution', 'task', 'executionID=' . $executionID);
$this->view->executionID = $executionID;
$this->view->projectID = $projectID;
$this->view->project = $project;
@@ -3255,6 +3256,8 @@ class execution extends control
*/
public function all($status = 'all', $projectID = 0, $orderBy = 'order_asc', $productID = 0, $recTotal = 0, $recPerPage = 10, $pageID = 1)
{
$this->session->set('closeTipsList', $this->app->getURI(true));
$this->app->loadLang('my');
$this->app->loadLang('product');
$this->app->loadLang('stage');