From 63693d73b0776febdb7258563f2ad4e2c5d49bd7 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 7 Nov 2024 07:09:29 +0100 Subject: [PATCH 1/3] start new version 5.1.37 --- CHANGELOG | 4 ++++ inc/inc.Version.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 3b02962f1..862228a5c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +-------------------------------------------------------------------------------- + Changes in version 5.1.37 +-------------------------------------------------------------------------------- + -------------------------------------------------------------------------------- Changes in version 5.1.36 -------------------------------------------------------------------------------- diff --git a/inc/inc.Version.php b/inc/inc.Version.php index da24b45d8..126070ffc 100644 --- a/inc/inc.Version.php +++ b/inc/inc.Version.php @@ -20,7 +20,7 @@ class SeedDMS_Version { /* {{{ */ - const _number = "5.1.36"; + const _number = "5.1.37"; const _string = "SeedDMS"; function __construct() { From 58a29b675b32a478a8847ca95e763c4cae6fd0e0 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 7 Nov 2024 08:51:08 +0100 Subject: [PATCH 2/3] add space between consecutive forms and divs,legends --- views/bootstrap/styles/application.css | 8 ++++++++ views/bootstrap4/styles/application.css | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/views/bootstrap/styles/application.css b/views/bootstrap/styles/application.css index 68898a15b..b951b0ab1 100644 --- a/views/bootstrap/styles/application.css +++ b/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; } diff --git a/views/bootstrap4/styles/application.css b/views/bootstrap4/styles/application.css index 951425d14..274beac75 100644 --- a/views/bootstrap4/styles/application.css +++ b/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; } From 1922899d7e4189736209ed682683a81bcc2672df Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 7 Nov 2024 08:52:03 +0100 Subject: [PATCH 3/3] allow to turn of comment for receptions --- CHANGELOG | 1 + inc/inc.ClassSettings.php | 4 ++++ op/op.Settings.php | 1 + out/out.ReceiptDocument.php | 1 + views/bootstrap/class.ReceiptDocument.php | 25 ++++++++++++++--------- views/bootstrap/class.Settings.php | 1 + 6 files changed, 23 insertions(+), 10 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 3bf69b8eb..503ed5fa1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index 2cb7f0382..ea3b52853 100644 --- a/inc/inc.ClassSettings.php +++ b/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); diff --git a/op/op.Settings.php b/op/op.Settings.php index ac3673034..7403c6668 100644 --- a/op/op.Settings.php +++ b/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"); diff --git a/out/out.ReceiptDocument.php b/out/out.ReceiptDocument.php index 85f0a6878..9ab888186 100644 --- a/out/out.ReceiptDocument.php +++ b/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; } diff --git a/views/bootstrap/class.ReceiptDocument.php b/views/bootstrap/class.ReceiptDocument.php index 03489b4a9..74cbc9ce1 100644 --- a/views/bootstrap/class.ReceiptDocument.php +++ b/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() { 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 ''; + } if($receiptreject) { $options = array(); if($receiptStatus['status'] != 1) diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index 2b0b7c4fd..5a9b65f17 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -597,6 +597,7 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk)) 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); ?> showConfigCheckbox('settings_enableReceiptWorkflow', 'enableReceiptWorkflow'); ?> showConfigCheckbox('settings_enableReceiptReject', 'enableReceiptReject'); ?> +showConfigCheckbox('settings_disableReceiptComment', 'disableReceiptComment'); ?> showConfigCheckbox('settings_enableRevisionWorkflow', 'enableRevisionWorkflow'); ?> showConfigCheckbox('settings_enableRevisionOneVoteReject', 'enableRevisionOneVoteReject'); ?> showConfigText('settings_versioningFileName', 'versioningFileName'); ?>