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

workflow mode can be traditional without review

Browse Source
This commit is contained in:
Uwe Steinmann 2015-03-16 08:58:10 +01:00
parent b4195171f9
commit 8f96bbaa1d
4 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
views/bootstrap/class.SetReviewersApprovers.php
View File

@ -37,6 +37,7 @@ class SeedDMS_View_SetReviewersApprovers extends SeedDMS_Bootstrap_Style {
$folder = $this->params['folder'];
$document = $this->params['document'];
$content = $this->params['version'];
$workflowmode = $this->params['workflowmode'];
$enableadminrevapp = $this->params['enableadminrevapp'];
$enableownerrevapp = $this->params['enableownerrevapp'];
$enableselfrevapp = $this->params['enableselfrevapp'];
@ -82,6 +83,9 @@ class SeedDMS_View_SetReviewersApprovers extends SeedDMS_Bootstrap_Style {
<form action="../op/op.SetReviewersApprovers.php" method="post" name="form1">
<?php
if($workflowmode != 'traditional_only_approval') {
?>
<?php $this->contentSubHeading(getMLText("update_reviewers"));?>
<div class="cbSelectTitle"><?php printMLText("individuals")?>:</div>
@ -151,6 +155,7 @@ class SeedDMS_View_SetReviewersApprovers extends SeedDMS_Bootstrap_Style {
}
?>
</select>
<?php } ?>
<?php $this->contentSubHeading(getMLText("update_approvers"));?>

1
views/bootstrap/class.Settings.php
View File

@ -470,6 +470,7 @@ if(!is_writeable($settings->_configFilePath)) {
<td>
<select name="workflowMode">
<option value="traditional" <?php if ($settings->_workflowMode=='traditional') echo "selected" ?>><?php printMLText("settings_workflowMode_valtraditional");?></option>
<option value="traditional_only_approval" <?php if ($settings->_workflowMode=='traditional_only_approval') echo "selected" ?>><?php printMLText("settings_workflowMode_valtraditional_only_approval");?></option>
<option value="advanced" <?php if ($settings->_workflowMode=='advanced') echo "selected" ?>><?php printMLText("settings_workflowMode_valadvanced");?></option>
</select>
</td>

8
views/bootstrap/class.UpdateDocument.php
View File

@ -132,7 +132,7 @@ function checkForm()
$latestContent = $document->getLatestContent();
$reviewStatus = $latestContent->getReviewStatus();
$approvalStatus = $latestContent->getApprovalStatus();
if($workflowmode != 'traditional') {
if($workflowmode == 'advanced') {
if($status = $latestContent->getStatus()) {
if($status["status"] == S_IN_WORKFLOW) {
$this->warningMsg("The current version of this document is in a workflow. This will be interrupted and cannot be completed if you upload a new version.");
@ -204,10 +204,11 @@ function checkForm()
<?php
}
}
if($workflowmode == 'traditional') {
if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
// Retrieve a list of all users and groups that have review / approve
// privileges.
$docAccess = $folder->getReadAccessList($enableadminrevapp, $enableownerrevapp);
if($workflowmode != 'traditional_only_approval') {
?>
<tr>
<td colspan="2">
@ -345,7 +346,8 @@ function checkForm()
}
?>
</td>
</tr>
</tr>
<?php } ?>
<tr>
<td colspan=2>
<?php $this->contentSubHeading(getMLText("assign_approvers")); ?>

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

@ -115,7 +115,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
/* Retrieve latest content */
$latestContent = $document->getLatestContent();
$needwkflaction = false;
if($workflowmode == 'traditional') {
if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
} else {
$workflow = $latestContent->getWorkflow();
if($workflow) {
@ -259,11 +259,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
<li><a data-target="#previous" data-toggle="tab"><?php printMLText('previous_versions'); ?></a></li>
<?php
}
if($workflowmode == 'traditional') {
if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
if((is_array($reviewStatus) && count($reviewStatus)>0) ||
(is_array($approvalStatus) && count($approvalStatus)>0)) {
?>
<li><a data-target="#revapp" data-toggle="tab"><?php echo getMLText('reviewers')."/".getMLText('approvers'); ?></a></li>
<li><a data-target="#revapp" data-toggle="tab"><?php if($workflowmode == 'traditional') echo getMLText('reviewers')."/"; echo getMLText('approvers'); ?></a></li>
<?php
}
} else {
@ -383,7 +383,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
if($accessop->mayOverwriteStatus()) {
print "<li><a href='../out/out.OverrideContentStatus.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'><i class=\"icon-align-justify\"></i>".getMLText("change_status")."</a></li>";
}
if($workflowmode == 'traditional') {
if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
// Allow changing reviewers/approvals only if not reviewed
if($accessop->maySetReviewersApprovers()) {
print "<li><a href='../out/out.SetReviewersApprovers.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'><i class=\"icon-edit\"></i>".getMLText("change_assignments")."</a></li>";
@ -454,7 +454,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
?>
</div>
<?php
if($workflowmode == 'traditional') {
if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
if((is_array($reviewStatus) && count($reviewStatus)>0) ||
(is_array($approvalStatus) && count($approvalStatus)>0)) {
?>
@ -463,7 +463,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
$this->contentContainerstart();
print "<table class=\"table-condensed\">\n";
if (is_array($reviewStatus) && count($reviewStatus)>0) {
if ($workflowmode != 'traditional_only_approval' && is_array($reviewStatus) && count($reviewStatus)>0) {
print "<tr><td colspan=5>\n";
$this->contentSubHeading(getMLText("reviewers"));
@ -647,6 +647,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
?>
</table>
</div>
<?php
if($workflowmode != 'traditional_only_approval') {
?>
<div class="span6">
<legend><?php printMLText('review_log'); ?></legend>
<table class="table condensed">
@ -698,6 +701,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
</table>
</div>
<?php
}
}
?>
</div>