From 5471c17b0f568e5fc4f022da94b584c7d57116cb Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 8 Mar 2016 16:07:42 +0100 Subject: [PATCH] better check if reviewer/approver still exist --- views/bootstrap/class.ViewDocument.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php index 79da05dfd..b6ebbc339 100644 --- a/views/bootstrap/class.ViewDocument.php +++ b/views/bootstrap/class.ViewDocument.php @@ -545,9 +545,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { } else { $reqName = htmlspecialchars($required->getFullName()." (".$required->getLogin().")"); + if($required->getId() == $user->getId() && ($user->getId() != $owner->getId() || $enableownerrevapp == 1)) + $is_reviewer = true; } - if($r["required"] == $user->getId() && ($user->getId() != $owner->getId() || $enableownerrevapp == 1)) - $is_reviewer = true; break; case 1: // Reviewer is a group. $required = $dms->getGroup($r["required"]); @@ -614,9 +614,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { } else { $reqName = htmlspecialchars($required->getFullName()." (".$required->getLogin().")"); + if($required->getId() == $user->getId()) + $is_approver = true; } - if($a["required"] == $user->getId()) - $is_approver = true; break; case 1: // Approver is a group. $required = $dms->getGroup($a["required"]); @@ -625,9 +625,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { } else { $reqName = "".htmlspecialchars($required->getName()).""; + if($required->isMember($user) && ($user->getId() != $owner->getId() || $enableownerrevapp == 1)) + $is_approver = true; } - if($required->isMember($user) && ($user->getId() != $owner->getId() || $enableownerrevapp == 1)) - $is_approver = true; break; } print "\n";