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

* [refac bug #57607] Fix bug.

Browse Source
This commit is contained in:
wangyidong
2024-12-02 10:28:06 +08:00
committed by 孙广明
parent 80287cf1a2
commit 8f70524e7b
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+1 -2
View File
@@ -3078,8 +3078,7 @@ class execution extends control
$this->view->product = $product;
$this->view->branches = $product->type == 'normal' ? array() : $this->loadModel('branch')->getPairs($product->id);
$this->view->plan = $this->dao->findById($story->plan)->from(TABLE_PRODUCTPLAN)->fields('title')->fetch('title');
$this->view->bugs = $this->dao->select('id,title')->from(TABLE_BUG)->where('story')->eq($storyID)->andWhere('deleted')->eq(0)->fetchAll();
$this->view->fromBug = $this->dao->select('id,title')->from(TABLE_BUG)->where('toStory')->eq($storyID)->fetch();
$this->view->bugs = $this->dao->select('id,title,status')->from(TABLE_BUG)->where('story')->eq($storyID)->andWhere('deleted')->eq(0)->fetchAll();
$this->view->cases = $this->dao->select('id,title')->from(TABLE_CASE)->where('story')->eq($storyID)->andWhere('deleted')->eq(0)->fetchAll();
$this->view->modulePath = $this->loadModel('tree')->getParents($story->module);
$this->view->users = $this->loadModel('user')->getPairs('noletter');
module/execution/ui/treestory.html.php
+6 -6
View File
@@ -326,12 +326,12 @@ div
array_values(array_map(function($bug) use($lang)
{
return h::li
(
set::title($bug->title),
label(setClass('circle size-sm'), $bug->id),
common::hasPriv('bug', 'view') ? a(set::href(helper::createLink('bug', 'view', "bugID=$bug->id")), setClass('title'), set('data-toggle', 'modal'), set::title($bug->title), $bug->title) : span(setClass('title'), $bug->title),
label(setClass("status-{$bug->status} size-sm"), $lang->bug->statusList[$bug->status])
);
(
set::title($bug->title),
label(setClass('circle size-sm'), $bug->id),
common::hasPriv('bug', 'view') ? a(set::href(helper::createLink('bug', 'view', "bugID=$bug->id")), setClass('title'), set('data-toggle', 'modal'), set::title($bug->title), $bug->title) : span(setClass('title'), $bug->title),
label(setClass("status-{$bug->status} size-sm ml-1"), $lang->bug->statusList[$bug->status])
);
}, $bugs))
)
) : null,
module/execution/ui/treetask.html.php
+7 -2
View File
@@ -21,12 +21,17 @@ div
setClass('flex-none rounded-full gray-outline'),
$task->id
),
$task->parent > 0 ? label
$task->isParent ? label
(
setClass('flex-none rounded-full dark-outline ml-2'),
$this->lang->task->parentAB
) : null,
$task->parent > 0 && !$task->isParent ? label
(
setClass('flex-none rounded-full dark-outline ml-2'),
$this->lang->task->childrenAB
) : null,
!empty($task->mode) ? label
!empty($task->mode) ? label
(
setClass('flex-none rounded-full dark-outline ml-2'),
$this->lang->task->multipleAB