mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-06-01 06:27:15 +00:00
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
commit
f24330740a
|
@ -1025,7 +1025,7 @@ $(document).ready( function() {
|
|||
}
|
||||
print "</tbody>\n</table>\n";
|
||||
$this->contentContainerEnd();
|
||||
|
||||
/*
|
||||
$wkflogs = $latestContent->getWorkflowLog();
|
||||
if($wkflogs) {
|
||||
$this->contentHeading(getMLText("workflow_log"));
|
||||
|
@ -1048,6 +1048,7 @@ $(document).ready( function() {
|
|||
}
|
||||
$this->contentContainerEnd();
|
||||
}
|
||||
*/
|
||||
}
|
||||
?>
|
||||
</div>
|
||||
|
@ -1512,6 +1513,31 @@ $(document).ready( function() {
|
|||
$this->columnEnd();
|
||||
}
|
||||
$this->rowEnd();
|
||||
|
||||
$wkflogs = $latestContent->getWorkflowLog();
|
||||
if($wkflogs) {
|
||||
$this->rowStart();
|
||||
$this->columnStart(12);
|
||||
$this->contentHeading(getMLText("workflow_log"));
|
||||
$this->contentContainerStart();
|
||||
echo "<table class=\"table table-condensed table-sm\"><thead>";
|
||||
echo "<th>".getMLText('workflow')."</th><th>".getMLText('date')."</th><th>".getMLText('action')."</th><th>".getMLText('user')."</th><th>".getMLText('comment')."</th></tr>\n";
|
||||
echo "</thead><tbody>";
|
||||
foreach($wkflogs as $wkflog) {
|
||||
echo "<tr>";
|
||||
echo "<td>".htmlspecialchars($wkflog->getWorkflow()->getName())."</td>";
|
||||
echo "<td>".getLongReadableDate($wkflog->getDate())."</td>";
|
||||
echo "<td>".htmlspecialchars(getMLText('action_'.strtolower($wkflog->getTransition()->getAction()->getName()), array(), $wkflog->getTransition()->getAction()->getName()))."</td>";
|
||||
$loguser = $wkflog->getUser();
|
||||
echo "<td>".htmlspecialchars($loguser->getFullName())."</td>";
|
||||
echo "<td>".htmlspecialchars($wkflog->getComment())."</td>";
|
||||
echo "</tr>";
|
||||
}
|
||||
print "</tbody>\n</table>\n";
|
||||
$this->contentContainerEnd();
|
||||
$this->columnEnd();
|
||||
$this->rowEnd();
|
||||
}
|
||||
?>
|
||||
</div>
|
||||
<?php
|
||||
|
|
Loading…
Reference in New Issue
Block a user