gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-10-10 11:02:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

do not show removed approvers/reviewers unless admin

Browse Source
This commit is contained in:
Uwe Steinmann 2020-09-23 08:53:05 +02:00
parent 76c02d89c7
commit 0f9ac271ce
1 changed files with 63 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
views/bootstrap/class.ViewDocument.php
View File

@ -837,38 +837,40 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
} }
break; break;
} }
print "<tr>\n"; if($user->isAdmin() || $r["status"] > -2) {
print "<td>".$reqName."</td>\n"; print "<tr>\n";
print "<td><i style=\"font-size: 80%;\">".$r["date"]." - "; print "<td>".$reqName."</td>\n";
/* $updateUser is the user who has done the review */ print "<td><i style=\"font-size: 80%;\">".$r["date"]." - ";
$updateUser = $dms->getUser($r["userID"]); /* $updateUser is the user who has done the review */
print (is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."</i><br />"; $updateUser = $dms->getUser($r["userID"]);
print htmlspecialchars($r["comment"]); print (is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."</i><br />";
if($r['file']) { print htmlspecialchars($r["comment"]);
echo "<br />"; if($r['file']) {
echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&reviewlogid=".$r['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"fa fa-download\"></i> ".getMLText('download')."</a>"; echo "<br />";
} echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&reviewlogid=".$r['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"fa fa-download\"></i> ".getMLText('download')."</a>";
print "</td>\n"; }
print "<td>"; print "</td>\n";
if($class) print "<td>";
echo "<i class=\"fa fa-circle text-".$class."\"></i> "; if($class)
print getReviewStatusText($r["status"])."</td>\n"; echo "<i class=\"fa fa-circle text-".$class."\"></i> ";
print "<td><ul class=\"unstyled\">"; print getReviewStatusText($r["status"])."</td>\n";
if($accesserr) print "<td><ul class=\"unstyled\">";
echo "<li><span class=\"text-error\">".$accesserr."</span></li>"; if($accesserr)
echo "<li><span class=\"text-error\">".$accesserr."</span></li>";
if($accessop->mayReview()) {
if ($is_reviewer) { if($accessop->mayReview()) {
if ($r["status"]==0) { if ($is_reviewer) {
print "<li><a href=\"../out/out.ReviewDocument.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."&reviewid=".$r['reviewID']."\" class=\"btn btn-primary btn-mini\">".getMLText("add_review")."</a></li>"; if ($r["status"]==0) {
} elseif ($accessop->mayUpdateReview($updateUser) && (($r["status"]==1)||($r["status"]==-1))) { print "<li><a href=\"../out/out.ReviewDocument.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."&reviewid=".$r['reviewID']."\" class=\"btn btn-primary btn-mini\">".getMLText("add_review")."</a></li>";
print "<li><a href=\"../out/out.ReviewDocument.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."&reviewid=".$r['reviewID']."\" class=\"btn btn-primary btn-mini\">".getMLText("edit")."</a></li>"; } elseif ($accessop->mayUpdateReview($updateUser) && (($r["status"]==1)||($r["status"]==-1))) {
print "<li><a href=\"../out/out.ReviewDocument.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."&reviewid=".$r['reviewID']."\" class=\"btn btn-primary btn-mini\">".getMLText("edit")."</a></li>";
}
} }
} }
print "</ul></td>\n";
print "</tr>\n";
} }
print "</ul></td>\n";
print "</tr>\n";
} }
print "</table>"; print "</table>";
// $this->contentContainerEnd(); // $this->contentContainerEnd();
@ -937,39 +939,41 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
} }
break; break;
} }
print "<tr>\n"; if($user->isAdmin() || $a["status"] > -2) {
print "<td>".$reqName."</td>\n"; print "<tr>\n";
print "<td><i style=\"font-size: 80%;\">".$a["date"]." - "; print "<td>".$reqName."</td>\n";
/* $updateUser is the user who has done the approval */ print "<td><i style=\"font-size: 80%;\">".$a["date"]." - ";
$updateUser = $dms->getUser($a["userID"]); /* $updateUser is the user who has done the approval */
print (is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$a["userID"]."'")."</i><br />"; $updateUser = $dms->getUser($a["userID"]);
print htmlspecialchars($a["comment"]); print (is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$a["userID"]."'")."</i><br />";
if($a['file']) { print htmlspecialchars($a["comment"]);
echo "<br />"; if($a['file']) {
echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&approvelogid=".$a['approveLogID']."\" class=\"btn btn-mini\"><i class=\"fa fa-download\"></i> ".getMLText('download')."</a>"; echo "<br />";
} echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&approvelogid=".$a['approveLogID']."\" class=\"btn btn-mini\"><i class=\"fa fa-download\"></i> ".getMLText('download')."</a>";
echo "</td>\n"; }
print "<td>"; echo "</td>\n";
if($class) print "<td>";
echo "<i class=\"fa fa-circle text-".$class."\"></i> "; if($class)
print getApprovalStatusText($a["status"])."</td>\n"; echo "<i class=\"fa fa-circle text-".$class."\"></i> ";
print "<td><ul class=\"unstyled\">"; print getApprovalStatusText($a["status"])."</td>\n";
if($accesserr) print "<td><ul class=\"unstyled\">";
echo "<li><span class=\"text-error\">".$accesserr."</span></li>"; if($accesserr)
echo "<li><span class=\"text-error\">".$accesserr."</span></li>";
if($accessop->mayApprove()) {
if ($is_approver) { if($accessop->mayApprove()) {
if ($a['status'] == 0) { if ($is_approver) {
print "<li><a class=\"btn btn-primary btn-mini\" href=\"../out/out.ApproveDocument.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."&approveid=".$a['approveID']."\">".getMLText("add_approval")."</a></li>"; if ($a['status'] == 0) {
} elseif ($accessop->mayUpdateApproval($updateUser) && (($a["status"]==1)||($a["status"]==-1))) { print "<li><a class=\"btn btn-primary btn-mini\" href=\"../out/out.ApproveDocument.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."&approveid=".$a['approveID']."\">".getMLText("add_approval")."</a></li>";
print "<li><a class=\"btn btn-primary btn-mini\" href=\"../out/out.ApproveDocument.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."&approveid=".$a['approveID']."\">".getMLText("edit")."</a></li>"; } elseif ($accessop->mayUpdateApproval($updateUser) && (($a["status"]==1)||($a["status"]==-1))) {
print "<li><a class=\"btn btn-primary btn-mini\" href=\"../out/out.ApproveDocument.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."&approveid=".$a['approveID']."\">".getMLText("edit")."</a></li>";
}
} }
} }
}
print "</ul>"; print "</ul>";
print "</td>\n"; print "</td>\n";
print "</tr>\n"; print "</tr>\n";
}
} }
} }