mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-02-06 15:14:58 +00:00
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
commit
111d433c8a
File diff suppressed because it is too large
Load Diff
4
styles/bootstrap/cytoscape/cytoscape.min.js
vendored
4
styles/bootstrap/cytoscape/cytoscape.min.js
vendored
File diff suppressed because one or more lines are too long
|
@ -1064,11 +1064,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
|
|||
}
|
||||
}
|
||||
|
||||
echo "<h4>".$workflow->getName()."</h4>";
|
||||
echo "<h4>".htmlspecialchars($workflow->getName())."</h4>";
|
||||
if($parentworkflow = $latestContent->getParentWorkflow()) {
|
||||
echo "<p>Sub workflow of '".$parentworkflow->getName()."'</p>";
|
||||
echo "<p>Sub workflow of '".htmlspecialchars($parentworkflow->getName())."'</p>";
|
||||
}
|
||||
echo "<h5>".getMLText('current_state').": ".$workflowstate->getName()."</h5>";
|
||||
echo "<h5>".getMLText('current_state').": ".htmlspecialchars($workflowstate->getName())."</h5>";
|
||||
echo "<table class=\"table table-condensed\">\n";
|
||||
echo "<tr>";
|
||||
echo "<td>".getMLText('next_state').":</td>";
|
||||
|
@ -1092,7 +1092,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
|
|||
echo "<td>";
|
||||
foreach($transusers as $transuser) {
|
||||
$u = $transuser->getUser();
|
||||
echo $u->getFullName();
|
||||
echo htmlspecialchars($u->getFullName());
|
||||
if($document->getAccessMode($u) < M_READ) {
|
||||
echo " (no access)";
|
||||
}
|
||||
|
@ -1110,7 +1110,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
|
|||
$g = $transgroup->getGroup();
|
||||
echo getMLText('at_least_n_users_of_group',
|
||||
array("number_of_users" => $transgroup->getNumOfUsers(),
|
||||
"group" => $g->getName()));
|
||||
"group" => htmlspecialchars($g->getName())));
|
||||
if ($document->getGroupAccessMode($g) < M_READ) {
|
||||
echo " (no access)";
|
||||
}
|
||||
|
@ -1140,10 +1140,10 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
|
|||
$wkflogs = $latestContent->getWorkflowLog($transition);
|
||||
foreach($wkflogs as $wkflog) {
|
||||
$loguser = $wkflog->getUser();
|
||||
echo $loguser->getFullName()." (";
|
||||
echo htmlspecialchars($loguser->getFullName())." (";
|
||||
$names = array();
|
||||
foreach($loguser->getGroups() as $loggroup) {
|
||||
$names[] = $loggroup->getName();
|
||||
$names[] = htmlspecialchars($loggroup->getName());
|
||||
}
|
||||
echo implode(", ", $names);
|
||||
echo ") - ";
|
||||
|
|
Loading…
Reference in New Issue
Block a user