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

This commit is contained in:
Uwe Steinmann 2021-08-20 11:16:21 +02:00
commit 43c1385e0f
3 changed files with 22 additions and 1 deletions

View File

@ -35,6 +35,7 @@ class SeedDMS_View_RemoveWorkflowFromDocument extends SeedDMS_Theme_Style {
$dms = $this->params['dms'];
$user = $this->params['user'];
$folder = $this->params['folder'];
$accessobject = $this->params['accessobject'];
$document = $this->params['document'];
$latestContent = $document->getLatestContent();
@ -87,7 +88,13 @@ class SeedDMS_View_RemoveWorkflowFromDocument extends SeedDMS_Theme_Style {
$this->columnStart(8);
?>
<div id="workflowgraph">
<iframe src="out.WorkflowGraph.php?workflow=<?php echo $workflow->getID(); ?>" width="100%" height="500" style="border: 1px solid #AAA;"></iframe>
<?php
if($accessobject->check_view_access('WorkflowGraph')) {
?>
<iframe src="out.WorkflowGraph.php?workflow=<?php echo $workflow->getID(); ?>" width="100%" height="600" style="border: 1px solid #AAA;"></iframe>
<?php
}
?>
</div>
<?php
$this->columnEnd();

View File

@ -35,6 +35,7 @@ class SeedDMS_View_RewindWorkflow extends SeedDMS_Theme_Style {
$dms = $this->params['dms'];
$user = $this->params['user'];
$folder = $this->params['folder'];
$accessobject = $this->params['accessobject'];
$document = $this->params['document'];
$latestContent = $document->getLatestContent();
@ -86,7 +87,13 @@ class SeedDMS_View_RewindWorkflow extends SeedDMS_Theme_Style {
$this->columnStart(8);
?>
<div id="workflowgraph">
<?php
if($accessobject->check_view_access('WorkflowGraph')) {
?>
<iframe src="out.WorkflowGraph.php?workflow=<?php echo $workflow->getID(); ?>" width="100%" height="600" style="border: 1px solid #AAA;"></iframe>
<?php
}
?>
</div>
<?php
$this->columnEnd();

View File

@ -35,6 +35,7 @@ class SeedDMS_View_RunSubWorkflow extends SeedDMS_Theme_Style {
$dms = $this->params['dms'];
$user = $this->params['user'];
$folder = $this->params['folder'];
$accessobject = $this->params['accessobject'];
$document = $this->params['document'];
$subworkflow = $this->params['subworkflow'];
@ -84,7 +85,13 @@ class SeedDMS_View_RunSubWorkflow extends SeedDMS_Theme_Style {
$this->columnStart(8);
?>
<div id="workflowgraph">
<?php
if($accessobject->check_view_access('WorkflowGraph')) {
?>
<iframe src="out.WorkflowGraph.php?workflow=<?php echo $subworkflow->getID(); ?>" width="100%" height="600" style="border: 1px solid #AAA;"></iframe>
<?php
}
?>
</div>
<?php
$this->columnEnd();