Merge branch 'seeddms-6.0.x'

CHANGELOG

@@ -1,3 +1,9 @@
+--------------------------------------------------------------------------------
+                     Changes in version 6.0.30
+--------------------------------------------------------------------------------
+- merge changes up to 5.1.37
+- receipt comment can be disabled
+
 --------------------------------------------------------------------------------
                      Changes in version 6.0.29
 --------------------------------------------------------------------------------
@@ -295,6 +301,10 @@
 - add document list which can be exported as an archive
 - search results can be exported
 
+--------------------------------------------------------------------------------
+                     Changes in version 5.1.37
+--------------------------------------------------------------------------------
+
 --------------------------------------------------------------------------------
                      Changes in version 5.1.36
 --------------------------------------------------------------------------------

inc/inc.ClassSettings.php

@@ -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);

inc/inc.Version.php

@@ -20,7 +20,7 @@
 
 class SeedDMS_Version { /* {{{ */
 
-	const _number = "6.0.29";
+	const _number = "6.0.30";
 	const _string = "SeedDMS";
 
 	function __construct() {

op/op.Settings.php

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

out/out.ReceiptDocument.php

@@ -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;
 }

views/bootstrap/class.ReceiptDocument.php

@@ -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(
+		if(!$noreceiptcomment) {
-			getMLText("comment"),
+			$this->formField(
-			array(
+				getMLText("comment"),
-				'element'=>'textarea',
+				array(
-				'name'=>'comment',
+					'element'=>'textarea',
-				'required'=>true,
+					'name'=>'comment',
-				'rows'=>4,
+					'required'=>true,
-				'cols'=>80
+					'rows'=>4,
-			)
+					'cols'=>80
-		);
+				)
+			);
+		} else {
+			echo '<input type="hidden" name="comment" value="">';
+		}
 		if($receiptreject) {
 			$options = array();
 			if($receiptStatus['status'] != 1)

views/bootstrap/class.Settings.php

@@ -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'); ?>

views/bootstrap/styles/application.css

@@ -99,6 +99,14 @@ ul.jqtree-tree li.jqtree_common > .jqtree-element:hover {
   background-color: #E0E0E0;
 }
 
+form + legend {
+	margin-top: 20px;
+}
+
+form + div {
+	margin-top: 10px;
+}
+
 legend > span {
 	float: right;
 }

views/bootstrap4/styles/application.css

@@ -118,6 +118,14 @@ ul.jqtree-tree li.jqtree_common > .jqtree-element:hover {
   background-color: #E0E0E0;
 }
 
+form + legend {
+	margin-top: 20px;
+}
+
+form + div {
+	margin-top: 10px;
+}
+
 legend > span {
 	float: right;
 }