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

Merge branch 'main' into feature/doctemplate

Browse Source
This commit is contained in:
daitingting
2025-03-31 06:58:16 +00:00
parent 350bb7326f bafca3c6f8
commit 4e2fa41081
259 changed files with 13277 additions and 1823 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+4 -4
View File
@@ -190,9 +190,9 @@ class executionModel extends model
/* When the cookie and session do not exist, get it from the config. */
if(!$executionID)
{
if(isset($this->cookie->lastExecution)) $executionID = (int)$this->cookie->lastExecution;
if(isset($this->session->execution)) $executionID = (int)$this->session->execution;
if(isset($this->config->execution->lastExecution)) $executionID = (int)$this->config->execution->lastExecution;
if($this->cookie->lastExecution) $executionID = (int)$this->cookie->lastExecution;
if(!$executionID && $this->session->execution) $executionID = (int)$this->session->execution;
if(!$executionID && isset($this->config->execution->lastExecution)) $executionID = (int)$this->config->execution->lastExecution;
}
/* If the execution doesn't exist in the list, use the first execution in the list. */
@@ -1915,7 +1915,7 @@ class executionModel extends model
$taskQuery = $this->session->taskQuery;
/* Limit current execution when no execution. */
if(strpos($taskQuery, "`execution` =") === false && strpos($taskQuery, "`project` =") === false) $taskQuery .= " AND `execution` = $executionID";
if(strpos($taskQuery, "`execution` =") === false && strpos($taskQuery, "`project` =") === false && $executionID) $taskQuery .= " AND `execution` = $executionID";
if(strpos($taskQuery, "`execution` = 'all'") !== false)
{
$executions = $this->getPairs(0, 'all', "nocode,noprefix,multiple");
module/execution/ui/kanban.html.php
+1
View File
@@ -13,6 +13,7 @@ namespace zin;
$canModifyExecution = common::canModify('execution', $execution);
$laneCount = 0;
$links = array();
foreach($kanbanList as $current => $region)
{
foreach($region['items'] as $index => $group)
module/execution/ui/taskkanban.html.php
+1 -1
View File
@@ -44,7 +44,7 @@ foreach($kanbanGroup as $index => $group)
$kanbanGroup[$index] = $group;
}
$laneCount += count($kanbanGroup);
if(!empty($kanbanGroup)) $laneCount += count($kanbanGroup);
$checkObject = new stdclass();
$checkObject->execution = $executionID;