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

allow to turn of comment for receptions

Browse Source
This commit is contained in:
Uwe Steinmann 2024-11-07 08:52:03 +01:00
parent 58a29b675b
commit 1922899d7e
6 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -2,6 +2,7 @@
Changes in version 6.0.30
--------------------------------------------------------------------------------
- merge changes up to 5.1.37
- receipt comment can be disabled
--------------------------------------------------------------------------------
Changes in version 6.0.29

4
inc/inc.ClassSettings.php
View File

@ -253,6 +253,8 @@ class Settings { /* {{{ */
var $_enableReceiptWorkflow = true;
// enable/disable reject of reception
var $_enableReceiptReject = false;
// enable/disable comment of reception
var $_disableReceiptComment = false;
// enable/disable revision workflow
var $_enableRevisionWorkflow = true;
// enable/disable revision on vote reject
@ -858,6 +860,7 @@ class Settings { /* {{{ */
$this->_workflowMode = strval($tab["workflowMode"]);
$this->_enableReceiptWorkflow = Settings::boolval($tab["enableReceiptWorkflow"]);
$this->_enableReceiptReject = Settings::boolval($tab["enableReceiptReject"]);
$this->_disableReceiptComment = Settings::boolval($tab["disableReceiptComment"]);
$this->_enableRevisionWorkflow = Settings::boolval($tab["enableRevisionWorkflow"]);
$this->_enableRevisionOneVoteReject = Settings::boolval($tab["enableRevisionOneVoteReject"]);
$this->_allowReviewerOnly = Settings::boolval($tab["allowReviewerOnly"]);
@ -1244,6 +1247,7 @@ class Settings { /* {{{ */
$this->setXMLAttributValue($node, "workflowMode", $this->_workflowMode);
$this->setXMLAttributValue($node, "enableReceiptWorkflow", $this->_enableReceiptWorkflow);
$this->setXMLAttributValue($node, "enableReceiptReject", $this->_enableReceiptReject);
$this->setXMLAttributValue($node, "disableReceiptComment", $this->_disableReceiptComment);
$this->setXMLAttributValue($node, "enableRevisionWorkflow", $this->_enableRevisionWorkflow);
$this->setXMLAttributValue($node, "enableRevisionOneVoteReject", $this->_enableRevisionOneVoteReject);
$this->setXMLAttributValue($node, "allowReviewerOnly", $this->_allowReviewerOnly);

1
op/op.Settings.php
View File

@ -259,6 +259,7 @@ if ($action == "saveSettings")
setStrValue("workflowMode");
setBoolValue("enableReceiptWorkflow");
setBoolValue("enableReceiptReject");
setBoolValue("disableReceiptComment");
setBoolValue("enableRevisionWorkflow");
setBoolValue("enableRevisionOnVoteReject");
setBoolValue("allowReviewerOnly");

1
out/out.ReceiptDocument.php
View File

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

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

@ -75,6 +75,7 @@ $(document).ready(function() {
$document = $this->params['document'];
$content = $this->params['version'];
$receiptreject = $this->params['receiptreject'];
$noreceiptcomment = $this->params['noreceiptcomment'];
$receipts = $content->getReceiptStatus();
foreach($receipts as $receipt) {
@ -117,16 +118,20 @@ $(document).ready(function() {
<?php echo createHiddenFieldWithKey('receiptdocument'); ?>
<?php
$this->contentContainerStart();
$this->formField(
getMLText("comment"),
array(
'element'=>'textarea',
'name'=>'comment',
'required'=>true,
'rows'=>4,
'cols'=>80
)
);
if(!$noreceiptcomment) {
$this->formField(
getMLText("comment"),
array(
'element'=>'textarea',
'name'=>'comment',
'required'=>true,
'rows'=>4,
'cols'=>80
)
);
} else {
echo '<input type="hidden" name="comment" value="">';
}
if($receiptreject) {
$options = array();
if($receiptStatus['status'] != 1)

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

@ -597,6 +597,7 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
<?php $this->showConfigOption('settings_workflowMode', 'workflowMode', array('traditional'=>'settings_workflowMode_valtraditional', 'traditional_only_approval'=>'settings_workflowMode_valtraditional_only_approval', 'advanced'=>'settings_workflowMode_valadvanced', 'none'=>'settings_workflowMode_valnone'), false, true); ?>
<?php $this->showConfigCheckbox('settings_enableReceiptWorkflow', 'enableReceiptWorkflow'); ?>
<?php $this->showConfigCheckbox('settings_enableReceiptReject', 'enableReceiptReject'); ?>
<?php $this->showConfigCheckbox('settings_disableReceiptComment', 'disableReceiptComment'); ?>
<?php $this->showConfigCheckbox('settings_enableRevisionWorkflow', 'enableRevisionWorkflow'); ?>
<?php $this->showConfigCheckbox('settings_enableRevisionOneVoteReject', 'enableRevisionOneVoteReject'); ?>
<?php $this->showConfigText('settings_versioningFileName', 'versioningFileName'); ?>