From 31b73774460aa57efe69ed701956b13e5b2a960f Mon Sep 17 00:00:00 2001 From: liuruogu Date: Tue, 5 Jul 2022 05:41:16 +0000 Subject: [PATCH 1/2] * Finish task #59641. --- module/block/control.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/module/block/control.php b/module/block/control.php index 8b283d930f..cecf38c74b 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -1714,10 +1714,10 @@ class block extends control if(common::hasPriv('bug', 'view') and $this->config->vision != 'lite') $hasViewPriv['bug'] = true; if($this->config->URAndSR and common::hasPriv('story', 'view') and $this->config->vision != 'lite') $hasViewPriv['requirement'] = true; if(common::hasPriv('story', 'view') and $this->config->vision != 'lite') $hasViewPriv['story'] = true; - if(common::hasPriv('risk', 'view') and $this->config->edition == 'max' and $this->config->vision != 'lite') $hasViewPriv['risk'] = true; - if(common::hasPriv('issue', 'view') and $this->config->edition == 'max' and $this->config->vision != 'lite') $hasViewPriv['issue'] = true; - if(common::hasPriv('meeting', 'view') and $this->config->edition == 'max' and $this->config->vision != 'lite') $hasViewPriv['meeting'] = true; - if(common::hasPriv('feedback', 'view') and $this->config->edition == 'max' and $this->config->vision != 'lite') $hasViewPriv['feedback'] = true; + if(common::hasPriv('risk', 'view') and $this->config->edition == 'max' and $this->config->vision != 'lite') $hasViewPriv['risk'] = true; + if(common::hasPriv('issue', 'view') and $this->config->edition == 'max' and $this->config->vision != 'lite') $hasViewPriv['issue'] = true; + if(common::hasPriv('meeting', 'view') and $this->config->edition == 'max' and $this->config->vision != 'lite') $hasViewPriv['meeting'] = true; + if(common::hasPriv('feedback', 'view') and in_array($this->config->edition, array('max', 'biz')) and $this->config->vision != 'lite') $hasViewPriv['feedback'] = true; $params = $this->get->param; $params = json_decode(base64_decode($params)); From 667b4fcd1a99a468441d04ba61063a25b41668a1 Mon Sep 17 00:00:00 2001 From: liuruogu Date: Tue, 5 Jul 2022 06:39:10 +0000 Subject: [PATCH 2/2] * Finish task #59641. --- .../ext/view/printassigntomeblock.lite.html.hook.php | 2 +- module/block/control.php | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/extension/lite/block/ext/view/printassigntomeblock.lite.html.hook.php b/extension/lite/block/ext/view/printassigntomeblock.lite.html.hook.php index d0992c9834..ddfa6fcaa1 100644 --- a/extension/lite/block/ext/view/printassigntomeblock.lite.html.hook.php +++ b/extension/lite/block/ext/view/printassigntomeblock.lite.html.hook.php @@ -1,3 +1,3 @@ diff --git a/module/block/control.php b/module/block/control.php index cecf38c74b..ec75a3c39f 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -1717,7 +1717,7 @@ class block extends control if(common::hasPriv('risk', 'view') and $this->config->edition == 'max' and $this->config->vision != 'lite') $hasViewPriv['risk'] = true; if(common::hasPriv('issue', 'view') and $this->config->edition == 'max' and $this->config->vision != 'lite') $hasViewPriv['issue'] = true; if(common::hasPriv('meeting', 'view') and $this->config->edition == 'max' and $this->config->vision != 'lite') $hasViewPriv['meeting'] = true; - if(common::hasPriv('feedback', 'view') and in_array($this->config->edition, array('max', 'biz')) and $this->config->vision != 'lite') $hasViewPriv['feedback'] = true; + if(common::hasPriv('feedback', 'view') and in_array($this->config->edition, array('max', 'biz'))) $hasViewPriv['feedback'] = true; $params = $this->get->param; $params = json_decode(base64_decode($params)); @@ -1730,6 +1730,12 @@ class block extends control $objectCountList += array('risk' => 'riskCount', 'issue' => 'issueCount', 'feedback' => 'feedbackCount'); } + if($this->config->edition == 'biz') + { + $objectList += array('feedback' => 'feedbacks'); + $objectCountList += array('feedback' => 'feedbackCount'); + } + $tasks = $this->loadModel('task')->getUserSuspendedTasks($this->app->user->account); foreach($objectCountList as $objectType => $objectCount) {