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

Merge branch release/22.0.beta of zentao/zentaopms (#13293)

Browse Source
This commit is contained in:
刘刚
2026-01-14 11:27:12 +08:00
committed by Gitfox
parent d453c9f33f 5c52703a32
commit e8ade2c5c0
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/js/kanban.ui.js
+1 -1
View File
@@ -249,7 +249,7 @@ window.renderAvatar = function(item)
if(item.cardType == 'story' && priv.canAssignStory) assignLink = $.createLink('story', 'assignTo', "id=" + item.id);
if(item.cardType == 'bug' && priv.canAssignBug) assignLink = $.createLink('bug', 'assignTo', "id=" + item.id);
if(item.cardType == 'task' && priv.canAssignTask && item.dbPrivs && item.dbPrivs.assignto) assignLink = $.createLink('task', 'assignTo', "executionID=" + executionID + "&id=" + item.id);
if(item.cardType == 'task' && priv.canAssignTask) assignLink = $.createLink('task', 'assignTo', "executionID=" + executionID + "&id=" + item.id);
if(item.assignedTo.length == 0)
{
module/kanban/tao.php
+4 -2
View File
@@ -482,8 +482,6 @@ class kanbanTao extends kanbanModel
$item['pri'] = $card->pri;
$item['color'] = $card->color;
$item['assignedTo'] = $card->assignedTo;
$item['parent'] = !empty($card->originParent) ? $card->originParent : 0;
$item['parent'] = !empty($card->rawParent) ? $card->rawParent : 0;
$item['isParent'] = !empty($card->isParent) ? $card->isParent: 0;
$item['progress'] = !empty($card->progress) ? $card->progress : 0;
$item['group'] = !empty($card->group) ? $card->group : '';
@@ -507,6 +505,10 @@ class kanbanTao extends kanbanModel
$item['realnames'] = '';
$item['order'] = $order;
$item['parent'] = 0;
if(!empty($card->originParent)) $item['parent'] = $card->originParent;
if(!empty($card->rawParent)) $item['parent'] = $card->rawParent;
if($card->assignedTo)
{
$assignedToList = explode(',', $card->assignedTo);