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

show date in configured format, skip groups of user if not exsit

Browse Source
This commit is contained in:
Uwe Steinmann 2021-12-03 10:49:59 +01:00
parent 84442d68f0
commit 14d8a1bd91
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -968,7 +968,7 @@ $(document).ready( function() {
echo "</thead><tbody>"; echo "</thead><tbody>";
foreach($wkflogs as $wkflog) { foreach($wkflogs as $wkflog) {
echo "<tr>"; echo "<tr>";
echo "<td>".$wkflog->getDate()."</td>"; echo "<td>".getLongReadableDate($wkflog->getDate())."</td>";
echo "<td>".htmlspecialchars(getMLText('action_'.strtolower($wkflog->getTransition()->getAction()->getName()), array(), $wkflog->getTransition()->getAction()->getName()))."</td>"; echo "<td>".htmlspecialchars(getMLText('action_'.strtolower($wkflog->getTransition()->getAction()->getName()), array(), $wkflog->getTransition()->getAction()->getName()))."</td>";
$loguser = $wkflog->getUser(); $loguser = $wkflog->getUser();
echo "<td>".htmlspecialchars($loguser->getFullName())."</td>"; echo "<td>".htmlspecialchars($loguser->getFullName())."</td>";
@ -1320,7 +1320,7 @@ $(document).ready( function() {
if($latestContent->executeWorkflowTransitionIsAllowed($transition)) { if($latestContent->executeWorkflowTransitionIsAllowed($transition)) {
/* If this is reached, then the transition should have been executed /* If this is reached, then the transition should have been executed
* but for some reason the next state hasn't been reached. This can * but for some reason the next state hasn't been reached. This can
* be causes, if a transition which was previously already executed * be caused, if a transition which was previously already executed
* is about to be executed again. E.g. there was already a transition * is about to be executed again. E.g. there was already a transition
* T1 from state S1 to S2 triggered by user U1. * T1 from state S1 to S2 triggered by user U1.
* Then there was a second transition T2 from * Then there was a second transition T2 from
@ -1334,14 +1334,15 @@ $(document).ready( function() {
$wkflogs = $latestContent->getWorkflowLog($transition); $wkflogs = $latestContent->getWorkflowLog($transition);
foreach($wkflogs as $wkflog) { foreach($wkflogs as $wkflog) {
$loguser = $wkflog->getUser(); $loguser = $wkflog->getUser();
echo htmlspecialchars($loguser->getFullName())." ("; echo htmlspecialchars($loguser->getFullName());
$names = array(); $names = array();
foreach($loguser->getGroups() as $loggroup) { foreach($loguser->getGroups() as $loggroup) {
$names[] = htmlspecialchars($loggroup->getName()); $names[] = htmlspecialchars($loggroup->getName());
} }
echo implode(", ", $names); if($names)
echo ") - "; echo " (".implode(", ", $names).")";
echo $wkflog->getDate(); echo " - ";
echo getLongReadableDate($wkflog->getDate());
echo "<br />"; echo "<br />";
} }
echo "</td>"; echo "</td>";