From 9d78ff4be1ed2042c2777f95e2f627f3dfefe884 Mon Sep 17 00:00:00 2001 From: wangyuting Date: Fri, 28 Jul 2023 16:15:07 +0800 Subject: [PATCH] * Adjust switch type on doc block. --- module/block/ui/productdocblock.html.php | 7 ++++-- module/block/ui/projectdocblock.html.php | 7 ++++-- module/block/zen.php | 29 ++++++++++++++++-------- 3 files changed, 29 insertions(+), 14 deletions(-) diff --git a/module/block/ui/productdocblock.html.php b/module/block/ui/productdocblock.html.php index f5e0e9698a..cdef61a9b4 100644 --- a/module/block/ui/productdocblock.html.php +++ b/module/block/ui/productdocblock.html.php @@ -124,10 +124,13 @@ panel a ( setClass('text-gray ml-4'), - $lang->product->involved, + $type == 'involved' ? $lang->product->involved : $lang->product->all, span(setClass('caret align-middle ml-1')) ), - set::items(array(array('text' => $lang->product->involved), array('text' => $lang->product->all))) + set::items(array( + array('text' => $lang->product->involved, 'url' => createLink('block', 'printBlock', "blockID={$block->id}¶ms=" . helper::safe64Encode("type=involved")), 'data-load' => 'target', 'data-selector' => "#productdoc-block-{$block->id}", 'data-partial' => true), + array('text' => $lang->product->all, 'url' => createLink('block', 'printBlock', "blockID={$block->id}¶ms=" . helper::safe64Encode("type=all")), 'data-load' => 'target', 'data-selector' => "#productdoc-block-{$block->id}", 'data-partial' => true)) + ) ), ) ), diff --git a/module/block/ui/projectdocblock.html.php b/module/block/ui/projectdocblock.html.php index 58702aa963..1b6eb26f6f 100644 --- a/module/block/ui/projectdocblock.html.php +++ b/module/block/ui/projectdocblock.html.php @@ -125,10 +125,13 @@ panel a ( setClass('text-gray ml-4'), - $lang->project->involved, + $type == 'involved' ? $lang->project->involved : $lang->project->all, span(setClass('caret align-middle ml-1')) ), - set::items(array(array('text' => $lang->project->involved), array('text' => $lang->project->all))) + set::items(array( + array('text' => $lang->project->involved, 'url' => createLink('block', 'printBlock', "blockID={$block->id}¶ms=" . helper::safe64Encode("type=involved")), 'data-load' => 'target', 'data-selector' => "#projectdoc-block-{$block->id}", 'data-partial' => true), + array('text' => $lang->project->all, 'url' => createLink('block', 'printBlock', "blockID={$block->id}¶ms=" . helper::safe64Encode("type=all")), 'data-load' => 'target', 'data-selector' => "#projectdoc-block-{$block->id}", 'data-partial' => true)) + ) ), ) ), diff --git a/module/block/zen.php b/module/block/zen.php index 9864aaa7f4..e57b6b3f28 100644 --- a/module/block/zen.php +++ b/module/block/zen.php @@ -968,6 +968,7 @@ class blockZen extends block * Print execution statistic block. * * @param object $block + * @param array $params * @access protected * @return void */ @@ -2117,11 +2118,15 @@ class blockZen extends block * Print product's document block. * * @param object $block + * @param array $params * @access protected * @return void */ - protected function printProductDocBlock(object $block): void + protected function printProductDocBlock(object $block, array $params = array()): void { + $type = 'involved'; + if(isset($params['type'])) $type = $params['type']; + $this->loadModel('doc'); $this->session->set('docList', $this->createLink('doc', 'index'), 'doc'); @@ -2154,21 +2159,25 @@ class blockZen extends block } } - $this->view->users = $this->loadModel('user')->getPairs('noletter'); - $this->view->products = $hasDataProducts; - $this->view->involveds = $hasDataInvolveds; - $this->view->docGroup = $docGroup; + $this->view->type = $type; + $this->view->users = $this->loadModel('user')->getPairs('noletter'); + $this->view->products = $type == 'involveds' ? $hasDataInvolveds : $hasDataProducts; + $this->view->docGroup = $docGroup; } /** * Print project's document block. * * @param object $block + * @param array $params * @access protected * @return void */ - protected function printProjectDocBlock(object $block): void + protected function printProjectDocBlock(object $block, array $params = array()): void { + $type = 'involved'; + if(isset($params['type'])) $type = $params['type']; + $this->loadModel('doc'); $this->app->loadLang('project'); $this->session->set('docList', $this->createLink('doc', 'index'), 'doc'); @@ -2230,10 +2239,10 @@ class blockZen extends block } } - $this->view->users = $this->loadModel('user')->getPairs('noletter'); - $this->view->projects = $hasDataProjects; - $this->view->involveds = $hasDataInvolveds; - $this->view->docGroup = $docGroup; + $this->view->type = $type; + $this->view->users = $this->loadModel('user')->getPairs('noletter'); + $this->view->projects = $type == 'involveds' ? $hasDataInvolveds : $hasDataProjects; + $this->view->docGroup = $docGroup; } /**