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

Merge branch 'fixbug_zhouxin_17415' into 'master'

Browse Source 
Fix bug #17415.

See merge request easycorp/zentaopms!2436
This commit is contained in:
孙广明
2022-03-22 06:06:31 +00:00
parent 2b1fee6181 cc2704e1d0
commit 88f1cd03d5
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
module/execution/control.php
View File

@@ -1317,7 +1317,6 @@ class execution extends control
$this->view->title = $this->lang->execution->tips;
$this->view->tips = $this->fetch('execution', 'tips', "executionID=$executionID");
$this->view->defaultURL = $this->session->closeTipsList ? $this->session->closeTipsList : $this->createLink('execution', 'task', 'executionID=' . $executionID);
$this->view->executionID = $executionID;
$this->view->projectID = $projectID;
$this->view->project = $project;
@@ -3263,8 +3262,6 @@ 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');

1
module/execution/view/create.html.php
View File

@@ -11,6 +11,7 @@
*/
?>
<?php if(isset($tips)):?>
<?php $defaultURL = $this->createLink('execution', 'all');?>
<?php include '../../common/view/header.html.php';?>
<body>
<div class='modal-dialog mw-500px' id='tipsModal'>