From ebfbc9df978e03b0f0fdb21218c2b08106955b1d Mon Sep 17 00:00:00 2001 From: daitingting Date: Fri, 5 Aug 2022 03:27:07 +0000 Subject: [PATCH] * Fix bug #26016. --- framework/model.class.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/framework/model.class.php b/framework/model.class.php index 2bd51df082..45c14dba1e 100644 --- a/framework/model.class.php +++ b/framework/model.class.php @@ -163,12 +163,11 @@ class model extends baseModel if($type == 'view' && !empty($this->config->openedApproval) && commonModel::hasPriv('approval', 'progress')) { $flow = $this->loadModel('workflow', 'flow')->getByModule($moduleName); - if($flow->approval == 'enabled') + if($flow->approval == 'enabled' && !empty($data->approval)) { - $approvalID = isset($data->approval) ? $data->approval : 0; $extraClass = strpos(',testsuite,build,release,productplan,', ",{$moduleName},") !== false ? 'btn-link' : ''; $approvalProgressMenu .= "
"; - $approvalProgressMenu .= baseHTML::a(helper::createLink('approval', 'progress', "approvalID={$approvalID}", '', true), $this->lang->flow->approvalProgress, "class='btn {$extraClass} iframe'"); + $approvalProgressMenu .= baseHTML::a(helper::createLink('approval', 'progress', "approvalID={$data->approval}", '', true), $this->lang->flow->approvalProgress, "class='btn {$extraClass} iframe'"); } }