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

Merge branch release/21.7.3 of zentao/zentaopms (#10250)

Browse Source
This commit is contained in:
刘刚
2025-07-08 13:19:33 +08:00
committed by Gitfox
parent bc2827bc77 4e6bd54235
commit d90c7bfa0e
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/zen.php
+1 -1
View File
@@ -2471,7 +2471,7 @@ class blockZen extends block
$involveds = $this->product->getOrderedProducts('involved', 0, 0, 'all');
$productIdList = array_merge(array_keys($products), array_keys($involveds));
$stmt = $this->dao->select('id,product,lib,title,type,addedBy,addedDate,editedDate,status,acl,groups,readGroups,users,readUsers,deleted')->from(TABLE_DOC)->alias('t1')
$stmt = $this->dao->select('id,product,lib,title,type,addedBy,addedDate,editedDate,status,acl,`groups`,readGroups,users,readUsers,deleted')->from(TABLE_DOC)->alias('t1')
->where('deleted')->eq(0)
->andWhere('product')->in($productIdList)
->beginIF($this->config->doc->notArticleType)->andWhere('t1.type')->notIN($this->config->doc->notArticleType)->fi()
module/task/model.php
-2
View File
@@ -1400,8 +1400,6 @@ class taskModel extends model
$task = $this->loadModel('file')->replaceImgURL($task, 'desc');
$task->files = $this->file->getByObject('task', $taskID);
if($setImgSize && $task->desc) $task->desc = $this->file->setImgSize($task->desc);
/* Get related test cases. */
if($task->story) $task->cases = $this->dao->select('id, title')->from(TABLE_CASE)->where('story')->eq($task->story)->andWhere('storyVersion')->eq($task->storyVersion)->andWhere('deleted')->eq('0')->fetchPairs();
/* Process a task, compute its progress and get its related information. */
return $this->processTask($task, false);