mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-12 12:41:30 +00:00
check if current workflow state != null
This commit is contained in:
parent
822aef2e53
commit
0f072fc9a9
|
@ -704,13 +704,17 @@ $(document).ready( function() {
|
||||||
$reverselinks = SeedDMS_Core_DMS::filterDocumentLinks($user, $reverselinks, 'source');
|
$reverselinks = SeedDMS_Core_DMS::filterDocumentLinks($user, $reverselinks, 'source');
|
||||||
|
|
||||||
$needwkflaction = false;
|
$needwkflaction = false;
|
||||||
|
$transitions = array();
|
||||||
if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
|
if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
|
||||||
} elseif($workflowmode == 'advanced') {
|
} elseif($workflowmode == 'advanced') {
|
||||||
$workflow = $latestContent->getWorkflow();
|
$workflow = $latestContent->getWorkflow();
|
||||||
if($workflow) {
|
if($workflow) {
|
||||||
$workflowstate = $latestContent->getWorkflowState();
|
if($workflowstate = $latestContent->getWorkflowState()) {
|
||||||
$transitions = $workflow->getNextTransitions($workflowstate);
|
$transitions = $workflow->getNextTransitions($workflowstate);
|
||||||
$needwkflaction = $latestContent->needsWorkflowAction($user);
|
$needwkflaction = $latestContent->needsWorkflowAction($user);
|
||||||
|
} else {
|
||||||
|
$this->warningMsg(getMLText('workflow_in_unknown_state'));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1096,7 +1100,7 @@ $(document).ready( function() {
|
||||||
$this->columnStart(12);
|
$this->columnStart(12);
|
||||||
$this->contentContainerStart();
|
$this->contentContainerStart();
|
||||||
if($user->isAdmin()) {
|
if($user->isAdmin()) {
|
||||||
if(SeedDMS_Core_DMS::checkIfEqual($workflow->getInitState(), $latestContent->getWorkflowState())) {
|
if(!$workflowstate || SeedDMS_Core_DMS::checkIfEqual($workflow->getInitState(), $workflowstate)) {
|
||||||
print "<form action=\"../out/out.RemoveWorkflowFromDocument.php\" method=\"get\"><input type=\"hidden\" name=\"documentid\" value=\"".$latestContent->getDocument()->getId()."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" /><button type=\"submit\" class=\"btn btn-danger\"><i class=\"fa fa-remove\"></i> ".getMLText('rm_workflow')."</button></form>";
|
print "<form action=\"../out/out.RemoveWorkflowFromDocument.php\" method=\"get\"><input type=\"hidden\" name=\"documentid\" value=\"".$latestContent->getDocument()->getId()."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" /><button type=\"submit\" class=\"btn btn-danger\"><i class=\"fa fa-remove\"></i> ".getMLText('rm_workflow')."</button></form>";
|
||||||
} else {
|
} else {
|
||||||
print "<form action=\"../out/out.RewindWorkflow.php\" method=\"get\"><input type=\"hidden\" name=\"documentid\" value=\"".$latestContent->getDocument()->getId()."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" /><button type=\"submit\" class=\"btn btn-danger\"><i class=\"fa fa-refresh\"></i> ".getMLText('rewind_workflow')."</button></form>";
|
print "<form action=\"../out/out.RewindWorkflow.php\" method=\"get\"><input type=\"hidden\" name=\"documentid\" value=\"".$latestContent->getDocument()->getId()."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" /><button type=\"submit\" class=\"btn btn-danger\"><i class=\"fa fa-refresh\"></i> ".getMLText('rewind_workflow')."</button></form>";
|
||||||
|
@ -1107,7 +1111,7 @@ $(document).ready( function() {
|
||||||
if($parentworkflow = $latestContent->getParentWorkflow()) {
|
if($parentworkflow = $latestContent->getParentWorkflow()) {
|
||||||
echo "<p>Sub workflow of '".htmlspecialchars($parentworkflow->getName())."'</p>";
|
echo "<p>Sub workflow of '".htmlspecialchars($parentworkflow->getName())."'</p>";
|
||||||
}
|
}
|
||||||
echo "<h5>".getMLText('current_state').": ".htmlspecialchars($workflowstate->getName())."</h5>";
|
echo "<h5>".getMLText('current_state').": ".($workflowstate ? htmlspecialchars($workflowstate->getName()) : htmlspecialchars(getMLText('workflow_in_unknown_state')))."</h5>";
|
||||||
echo "<table class=\"table table-condensed table-sm\">\n";
|
echo "<table class=\"table table-condensed table-sm\">\n";
|
||||||
echo "<tr>";
|
echo "<tr>";
|
||||||
echo "<td>".getMLText('next_state').":</td>";
|
echo "<td>".getMLText('next_state').":</td>";
|
||||||
|
@ -1211,7 +1215,7 @@ $(document).ready( function() {
|
||||||
if($workflows) {
|
if($workflows) {
|
||||||
$subworkflows = array();
|
$subworkflows = array();
|
||||||
foreach($workflows as $wkf) {
|
foreach($workflows as $wkf) {
|
||||||
if($wkf->getInitState()->getID() == $workflowstate->getID()) {
|
if($workflowstate && ($wkf->getInitState()->getID() == $workflowstate->getID())) {
|
||||||
if($workflow->getID() != $wkf->getID()) {
|
if($workflow->getID() != $wkf->getID()) {
|
||||||
$subworkflows[] = $wkf;
|
$subworkflows[] = $wkf;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user