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

* Fix bug #40672.

Browse Source
This commit is contained in:
hufangzhou
2023-11-29 15:36:50 +08:00
parent 02d232c106
commit c854467be5
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+2 -1
View File
@@ -133,7 +133,8 @@ class execution extends control
/* Set browse type. */
$browseType = strtolower($status);
$execution = $this->commonAction($executionID, $status);
$execution = $this->commonAction($executionID, $status);
if($this->config->systemMode == 'PLM') $execution->ipdStage = $this->execution->canStageStart($execution);
$executionID = $execution->id;
if($execution->type == 'kanban' and $this->config->vision != 'lite' and $this->app->getViewType() != 'json') $this->locate($this->createLink('execution', 'kanban', "executionID=$executionID"));
module/execution/view/task.html.php
+1 -1
View File
@@ -15,7 +15,7 @@ include '../../common/view/header.html.php';
include '../../common/view/datatable.fix.html.php';
include '../../common/view/zui3dtable.html.php';
$cols = $this->task->generateCol($orderBy);
$tasks = $this->task->generateRow($tasks, $users, $executionID, $showBranch, $branchGroups, $modulePairs);
$tasks = $this->task->generateRow($tasks, $users, $execution, $showBranch, $branchGroups, $modulePairs);
$assignApp = $setModule ? '' : '#app=project';
$sortLink = helper::createLink('execution', 'task', "executionID={$execution->id}&status={$status}&param={$param}&orderBy={orderBy}&recTotal={$recTotal}&recPerPage={$recPerPage}") . $assignApp;
js::set('moduleID', $moduleID);
module/task/model.php
+6 -5
View File
@@ -4296,10 +4296,11 @@ class taskModel extends model
* Build task browse action menu.
*
* @param object $task
* @param object $execution
* @access public
* @return string
*/
public function buildOperateBrowseMenu($task, $execution = '')
public function buildOperateBrowseMenu($task, $execution)
{
$menu = '';
$params = "taskID=$task->id";
@@ -4644,14 +4645,14 @@ class taskModel extends model
*
* @param array $tasks
* @param array $users
* @param int $executionID
* @param object $execution
* @param bool $showBranch
* @param array $branchGroups
* @param array $modulePairs
* @access public
* @return array
*/
public function generateRow($tasks, $users, $executionID, $showBranch, $branchGroups, $modulePairs)
public function generateRow($tasks, $users, $execution, $showBranch, $branchGroups, $modulePairs)
{
$userFields = array('assignedTo', 'openedBy', 'closedBy', 'lastEditedBy', 'finishedBy');
$dateFields = array('assignedDate', 'openedDate', 'deadline', 'finishedDate', 'closedDate', 'lastEditedDate', 'canceledDate', 'activatedDate', 'estStarted', 'realStarted', 'replacetypeDate');
@@ -4661,7 +4662,7 @@ class taskModel extends model
foreach($tasks as $task)
{
$task->actions = '<div class="c-actions">' . $this->buildOperateBrowseMenu($task) . '</div>';
$task->actions = '<div class="c-actions">' . $this->buildOperateBrowseMenu($task, $execution) . '</div>';
$task->assignedTo = $this->printAssignedHtml($task, $users, false);
$taskName = '';
@@ -4746,7 +4747,7 @@ class taskModel extends model
if(!empty($children))
{
$rows = array_merge($rows, $this->generateRow($children, $users, $executionID, $showBranch, $branchGroups, $modulePairs));
$rows = array_merge($rows, $this->generateRow($children, $users, $execution, $showBranch, $branchGroups, $modulePairs));
}
}
return $rows;