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

show expiration date; show login on review/approval page

Browse Source
This commit is contained in:
Uwe Steinmann 2013-04-30 08:36:53 +02:00
parent f7a5daa8a0
commit 1ef343903c
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -213,6 +213,14 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
<td><?php print getLongReadableDate($document->getDate()); ?></td> <td><?php print getLongReadableDate($document->getDate()); ?></td>
</tr> </tr>
<?php <?php
if($document->expires()) {
?>
<tr>
<td><?php printMLText("expires");?>:</td>
<td><?php print getReadableDate($document->getExpires()); ?></td>
</tr>
<?php
}
if($document->getKeywords()) { if($document->getKeywords()) {
?> ?>
<tr> <tr>
@ -463,7 +471,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
$reqName = getMLText("unknown_user")." '".$r["required"]."'"; $reqName = getMLText("unknown_user")." '".$r["required"]."'";
} }
else { else {
$reqName = htmlspecialchars($required->getFullName()); $reqName = htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
} }
if($r["required"] == $user->getId()) if($r["required"] == $user->getId())
$is_reviewer = true; $is_reviewer = true;
@ -485,7 +493,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
print "<td><ul class=\"unstyled\"><li>".$r["date"]."</li>"; print "<td><ul class=\"unstyled\"><li>".$r["date"]."</li>";
/* $updateUser is the user who has done the review */ /* $updateUser is the user who has done the review */
$updateUser = $dms->getUser($r["userID"]); $updateUser = $dms->getUser($r["userID"]);
print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()) : "unknown user id '".$r["userID"]."'")."</li></ul></td>"; print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."</li></ul></td>";
print "<td>".htmlspecialchars($r["comment"])."</td>\n"; print "<td>".htmlspecialchars($r["comment"])."</td>\n";
print "<td>".getReviewStatusText($r["status"])."</td>\n"; print "<td>".getReviewStatusText($r["status"])."</td>\n";
print "<td><ul class=\"unstyled\">"; print "<td><ul class=\"unstyled\">";
@ -527,7 +535,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
$reqName = getMLText("unknown_user")." '".$a["required"]."'"; $reqName = getMLText("unknown_user")." '".$a["required"]."'";
} }
else { else {
$reqName = htmlspecialchars($required->getFullName()); $reqName = htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
} }
if($a["required"] == $user->getId()) if($a["required"] == $user->getId())
$is_approver = true; $is_approver = true;
@ -549,7 +557,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
print "<td><ul class=\"unstyled\"><li>".$a["date"]."</li>"; print "<td><ul class=\"unstyled\"><li>".$a["date"]."</li>";
/* $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 "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()) : "unknown user id '".$a["userID"]."'")."</li></ul></td>"; print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$a["userID"]."'")."</li></ul></td>";
print "<td>".htmlspecialchars($a["comment"])."</td>\n"; print "<td>".htmlspecialchars($a["comment"])."</td>\n";
print "<td>".getApprovalStatusText($a["status"])."</td>\n"; print "<td>".getApprovalStatusText($a["status"])."</td>\n";
print "<td><ul class=\"unstyled\">"; print "<td><ul class=\"unstyled\">";