From 7a96302c2cb67e12e75f7ac15c68c40749feb4e0 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Tue, 17 Oct 2023 15:27:50 +0800 Subject: [PATCH] * Optimize code of execution list block. --- module/block/ui/executionlistblock.html.php | 8 ++++++++ module/block/zen.php | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/module/block/ui/executionlistblock.html.php b/module/block/ui/executionlistblock.html.php index 01b9a25a66..6406e77b08 100644 --- a/module/block/ui/executionlistblock.html.php +++ b/module/block/ui/executionlistblock.html.php @@ -11,6 +11,14 @@ declare(strict_types=1); namespace zin; +if(!$longBlock) +{ + unset($config->block->execution->dtable->fieldList['status']); + unset($config->block->execution->dtable->fieldList['totalEstimate']); + unset($config->block->execution->dtable->fieldList['totalConsumed']); + unset($config->block->execution->dtable->fieldList['burns']); +} + panel ( set::title($block->title), diff --git a/module/block/zen.php b/module/block/zen.php index 3cdea121e4..4b7839db31 100644 --- a/module/block/zen.php +++ b/module/block/zen.php @@ -1958,7 +1958,7 @@ class blockZen extends block $this->app->loadClass('pager', true); $pager = pager::init(0, $count, 1); - $projectID = $block->module == 'my' ? 0 : (int)$this->session->project; + $projectID = $block->dashboard == 'my' ? 0 : (int)$this->session->project; $executions = $this->execution->getStatData($projectID, $status, 0, 0, false, 'skipParent', 'id_asc', $pager); if($executions)