gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-06 07:04:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

new config option enableReceiptReject

Browse Source 
enables rejection of receipts
This commit is contained in:
Uwe Steinmann 2019-04-09 10:51:51 +02:00
parent f5505e85b2
commit 469370cb42
5 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
inc/inc.ClassSettings.php
View File

@ -186,6 +186,8 @@ class Settings { /* {{{ */
var $_workflowMode = "traditional";
// enable/disable acknowledge workflow
var $_enableReceiptWorkflow = true;
// enable/disable reject of reception
var $_enableReceiptReject = false;
// enable/disable revision workflow
var $_enableRevisionWorkflow = true;
// enable/disable revision on vote reject
@ -701,9 +703,10 @@ class Settings { /* {{{ */
$this->_initialDocumentStatus = intval($tab["initialDocumentStatus"]);
$this->_versioningFileName = strval($tab["versioningFileName"]);
$this->_workflowMode = strval($tab["workflowMode"]);
$this->_enableReceiptWorkflow = strval($tab["enableReceiptWorkflow"]);
$this->_enableRevisionWorkflow = strval($tab["enableRevisionWorkflow"]);
$this->_enableRevisionOnVoteReject = strval($tab["enableRevisionOnVoteReject"]);
$this->_enableReceiptWorkflow = Settings::boolval($tab["enableReceiptWorkflow"]);
$this->_enableReceiptReject = Settings::boolval($tab["enableReceiptReject"]);
$this->_enableRevisionWorkflow = Settings::boolval($tab["enableRevisionWorkflow"]);
$this->_enableRevisionOnVoteReject = Settings::boolval($tab["enableRevisionOnVoteReject"]);
$this->_allowReviewerOnly = Settings::boolval($tab["allowReviewerOnly"]);
$this->_allowChangeRevAppInProcess = Settings::boolval($tab["allowChangeRevAppInProcess"]);
$this->_enableVersionDeletion = Settings::boolval($tab["enableVersionDeletion"]);
@ -1032,6 +1035,7 @@ class Settings { /* {{{ */
$this->setXMLAttributValue($node, "versioningFileName", $this->_versioningFileName);
$this->setXMLAttributValue($node, "workflowMode", $this->_workflowMode);
$this->setXMLAttributValue($node, "enableReceiptWorkflow", $this->_enableReceiptWorkflow);
$this->setXMLAttributValue($node, "enableReceiptReject", $this->_enableReceiptReject);
$this->setXMLAttributValue($node, "enableRevisionWorkflow", $this->_enableRevisionWorkflow);
$this->setXMLAttributValue($node, "enableRevisionOnVoteReject", $this->_enableRevisionOnVoteReject);
$this->setXMLAttributValue($node, "allowReviewerOnly", $this->_allowReviewerOnly);

1
op/op.Settings.php
View File

@ -185,6 +185,7 @@ if ($action == "saveSettings")
$settings->_initialDocumentStatus = $_POST["initialDocumentStatus"];
$settings->_workflowMode = $_POST["workflowMode"];
$settings->_enableReceiptWorkflow = getBoolValue("enableReceiptWorkflow");
$settings->_enableReceiptReject = getBoolValue("enableReceiptReject");
$settings->_enableRevisionWorkflow = getBoolValue("enableRevisionWorkflow");
$settings->_enableRevisionOnVoteReject = getBoolValue("enableRevisionOnVoteReject");
$settings->_allowReviewerOnly = getBoolValue("allowReviewerOnly");

1
out/out.ReceiptDocument.php
View File

@ -78,6 +78,7 @@ if($view) {
$view->setParam('document', $document);
$view->setParam('version', $content);
$view->setParam('accessobject', $accessop);
$view->setParam('receiptreject', $settings->_enableReceiptReject);
$view($_GET);
exit;
}

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

@ -93,6 +93,7 @@ $(document).ready(function() {
$folder = $this->params['folder'];
$document = $this->params['document'];
$content = $this->params['version'];
$receiptreject = $this->params['receiptreject'];
$receipts = $content->getReceiptStatus();
foreach($receipts as $receipt) {
@ -135,6 +136,7 @@ $(document).ready(function() {
<textarea name="comment" cols="80" rows="4"></textarea>
</div>
</div>
<?php if($receiptreject) { ?>
<div class="control-group">
<label class="control-label"><?php printMLText("receipt_status");?>:</label>
<div class="controls">
@ -148,6 +150,9 @@ $(document).ready(function() {
</select>
</div>
</div>
<?php } else { ?>
<input type="hidden" name="receiptStatus" value="1" />
<?php } ?>
<div class="controls">
<input type='submit' class="btn" name='<?= $receipttype ?>Receipt' value='<?php printMLText("submit_receipt")?>'/>
<div>

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

@ -431,6 +431,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site'));
<?php $this->showConfigHeadline('settings_Edition'); ?>
<?php $this->showConfigOption('settings_workflowMode', 'workflowMode', array('traditional'=>'settings_workflowMode_valtraditional', 'traditional_only_approval'=>'settings_workflowMode_valtraditional_only_approval', 'advanced'=>'settings_workflowMode_valadvanced'), false, true); ?>
<?php $this->showConfigCheckbox('settings_enableReceiptWorkflow', 'enableReceiptWorkflow'); ?>
<?php $this->showConfigCheckbox('settings_enableReceiptReject', 'enableReceiptReject'); ?>
<?php $this->showConfigCheckbox('settings_enableRevisionWorkflow', 'enableRevisionWorkflow'); ?>
<?php $this->showConfigCheckbox('settings_enableRevisionOnVoteReject', 'enableRevisionOnVoteReject'); ?>
<?php $this->showConfigText('settings_versioningFileName', 'versioningFileName'); ?>