Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

This commit is contained in:
Uwe Steinmann 2020-09-23 08:55:44 +02:00
commit fdfad60c97

View File

@ -1005,7 +1005,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
if($user->isAdmin() || $a["status"] > -2) { if($user->isAdmin() || $a["status"] > -2) {
print "<tr>\n"; print "<tr>\n";
print "<td>".$reqName."</td>\n"; print "<td>".$reqName."</td>\n";
print "<td><ul class=\"unstyled\"><li>".$a["date"]."</li>"; print "<td><i style=\"font-size: 80%;\">".$a["date"]." - ";
/* $updateUser is the user who has done the approval */ /* $updateUser is the user who has done the approval */
$updateUser = $dms->getUser($a["userID"]); $updateUser = $dms->getUser($a["userID"]);
print (is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$a["userID"]."'")."</i><br />"; print (is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$a["userID"]."'")."</i><br />";