gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-03-12 00:45:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2018-02-27 07:40:01 +01:00
commit a87d493cb3
5 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -93,6 +93,8 @@
- configuration variables in extension of type 'select' may have an empty option
- default position of documents/folders can be set in configuration (Closes #381)
- attribute values can be deleted from all folders, documents
- new settings to disallow upload of documents with just a reviewer in traditional
workflow mode
--------------------------------------------------------------------------------
Changes in version 5.1.5

4
inc/inc.ClassSettings.php
View File

@ -186,6 +186,8 @@ class Settings { /* {{{ */
var $_enableAcknowledgeWorkflow = true;
// enable/disable revision workflow
var $_enableRevisionWorkflow = true;
// Allow to set just a reviewer in tradional workflow
var $_allowReviewerOnly = true;
// enable/disable log system
var $_logFileEnable = true;
// the log file rotation
@ -647,6 +649,7 @@ class Settings { /* {{{ */
$this->_workflowMode = strval($tab["workflowMode"]);
$this->_enableAcknowledgeWorkflow = strval($tab["enableAcknowledgeWorkflow"]);
$this->_enableRevisionWorkflow = strval($tab["enableRevisionWorkflow"]);
$this->_allowReviewerOnly = Settings::boolval($tab["allowReviewerOnly"]);
$this->_enableVersionDeletion = Settings::boolval($tab["enableVersionDeletion"]);
$this->_enableVersionModification = Settings::boolval($tab["enableVersionModification"]);
$this->_enableDuplicateDocNames = Settings::boolval($tab["enableDuplicateDocNames"]);
@ -962,6 +965,7 @@ class Settings { /* {{{ */
$this->setXMLAttributValue($node, "workflowMode", $this->_workflowMode);
$this->setXMLAttributValue($node, "enableAcknowledgeWorkflow", $this->_enableAcknowledgeWorkflow);
$this->setXMLAttributValue($node, "enableRevisionWorkflow", $this->_enableRevisionWorkflow);
$this->setXMLAttributValue($node, "allowReviewerOnly", $this->_allowReviewerOnly);
$this->setXMLAttributValue($node, "enableVersionDeletion", $this->_enableVersionDeletion);
$this->setXMLAttributValue($node, "enableVersionModification", $this->_enableVersionModification);
$this->setXMLAttributValue($node, "enableDuplicateDocNames", $this->_enableDuplicateDocNames);

6
op/op.AddDocument.php
View File

@ -256,6 +256,12 @@ if($settings->_workflowMode == 'traditional' || $settings->_workflowMode == 'tra
}
}
}
if($settings->_workflowMode == 'traditional' && !$settings->_allowReviewerOnly) {
/* Check if reviewers are send but no approvers */
if(($reviewers["i"] || $reviewers["g"]) && !$approvers["i"] && !$approvers["g"]) {
UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("error_uploading_reviewer_only"));
}
}
} elseif($settings->_workflowMode == 'advanced') {
if(!$workflows = $user->getMandatoryWorkflows()) {
if(isset($_POST["workflow"]))

1
op/op.Settings.php
View File

@ -180,6 +180,7 @@ if ($action == "saveSettings")
$settings->_workflowMode = $_POST["workflowMode"];
$settings->_enableAcknowledgeWorkflow = getBoolValue("enableAcknowledgeWorkflow");
$settings->_enableRevisionWorkflow = getBoolValue("enableRevisionWorkflow");
$settings->_allowReviewerOnly = getBoolValue("allowReviewerOnly");
$settings->_enableAdminRevApp = getBoolValue("enableAdminRevApp");
$settings->_enableOwnerRevApp = getBoolValue("enableOwnerRevApp");
$settings->_enableSelfRevApp = getBoolValue("enableSelfRevApp");

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

@ -695,6 +695,10 @@ if(!is_writeable($settings->_configFilePath)) {
</select>
</td>
</tr>
<tr title="<?php printMLText("settings_allowReviewerOnly_desc");?>">
<td><?php printMLText("settings_allowReviewerOnly");?>:</td>
<td><input name="allowReviewerOnly" type="checkbox" <?php if ($settings->_allowReviewerOnly) echo "checked" ?> /></td>
</tr>
<tr title="<?php printMLText("settings_enableAdminRevApp_desc");?>">
<td><?php printMLText("settings_enableAdminRevApp");?>:</td>
<td><input name="enableAdminRevApp" type="checkbox" <?php if ($settings->_enableAdminRevApp) echo "checked" ?> /></td>