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

new config options for disallowing duplicate subfolder names

Browse Source
This commit is contained in:
Uwe Steinmann 2019-07-01 10:50:40 +02:00
parent 24a83e8f27
commit b1a895fb27
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/settings.xml.template
View File

@ -248,6 +248,7 @@
- enableVersionDeletion: allow to delete versions after approval - enableVersionDeletion: allow to delete versions after approval
- enableVersionModification: allow to modify versions after approval - enableVersionModification: allow to modify versions after approval
- enableDuplicateDocNames: allow duplicate names in a folder - enableDuplicateDocNames: allow duplicate names in a folder
- enableDuplicateSubFolderNames: allow duplicate names in a folder
- enableOwnerRevApp: XXX - enableOwnerRevApp: XXX
- enableSelfRevApp: XXX - enableSelfRevApp: XXX
- presetExpirationDate: XXX - presetExpirationDate: XXX
@ -260,6 +261,7 @@
enableVersionDeletion = "true" enableVersionDeletion = "true"
enableVersionModification = "true" enableVersionModification = "true"
enableDuplicateDocNames = "true" enableDuplicateDocNames = "true"
enableDuplicateSubFolderNames = "true"
enableOwnerRevApp = "false" enableOwnerRevApp = "false"
enableSelfRevApp = "false" enableSelfRevApp = "false"
presetExpirationDate = "" presetExpirationDate = ""

4
inc/inc.ClassSettings.php
View File

@ -147,6 +147,8 @@ class Settings { /* {{{ */
var $_enableVersionModification = false; var $_enableVersionModification = false;
// enable/disable duplicate names of a document in a folder // enable/disable duplicate names of a document in a folder
var $_enableDuplicateDocNames = true; var $_enableDuplicateDocNames = true;
// enable/disable duplicate names of a subfolder in a folder
var $_enableDuplicateSubFolderNames = true;
// override mimetype set by browser when uploading a file // override mimetype set by browser when uploading a file
var $_overrideMimeType = false; var $_overrideMimeType = false;
// enable/disable notification when added as a reviewer/approver // enable/disable notification when added as a reviewer/approver
@ -652,6 +654,7 @@ class Settings { /* {{{ */
$this->_enableVersionDeletion = Settings::boolval($tab["enableVersionDeletion"]); $this->_enableVersionDeletion = Settings::boolval($tab["enableVersionDeletion"]);
$this->_enableVersionModification = Settings::boolval($tab["enableVersionModification"]); $this->_enableVersionModification = Settings::boolval($tab["enableVersionModification"]);
$this->_enableDuplicateDocNames = Settings::boolval($tab["enableDuplicateDocNames"]); $this->_enableDuplicateDocNames = Settings::boolval($tab["enableDuplicateDocNames"]);
$this->_enableDuplicateSubFolderNames = Settings::boolval($tab["enableDuplicateSubFolderNames"]);
$this->_overrideMimeType = Settings::boolval($tab["overrideMimeType"]); $this->_overrideMimeType = Settings::boolval($tab["overrideMimeType"]);
$this->_removeFromDropFolder = Settings::boolval($tab["removeFromDropFolder"]); $this->_removeFromDropFolder = Settings::boolval($tab["removeFromDropFolder"]);
} }
@ -965,6 +968,7 @@ class Settings { /* {{{ */
$this->setXMLAttributValue($node, "enableVersionDeletion", $this->_enableVersionDeletion); $this->setXMLAttributValue($node, "enableVersionDeletion", $this->_enableVersionDeletion);
$this->setXMLAttributValue($node, "enableVersionModification", $this->_enableVersionModification); $this->setXMLAttributValue($node, "enableVersionModification", $this->_enableVersionModification);
$this->setXMLAttributValue($node, "enableDuplicateDocNames", $this->_enableDuplicateDocNames); $this->setXMLAttributValue($node, "enableDuplicateDocNames", $this->_enableDuplicateDocNames);
$this->setXMLAttributValue($node, "enableDuplicateSubFolderNames", $this->_enableDuplicateSubFolderNames);
$this->setXMLAttributValue($node, "overrideMimeType", $this->_overrideMimeType); $this->setXMLAttributValue($node, "overrideMimeType", $this->_overrideMimeType);
$this->setXMLAttributValue($node, "removeFromDropFolder", $this->_removeFromDropFolder); $this->setXMLAttributValue($node, "removeFromDropFolder", $this->_removeFromDropFolder);

1
op/op.Settings.php
View File

@ -186,6 +186,7 @@ if ($action == "saveSettings")
$settings->_enableVersionDeletion = getBoolValue("enableVersionDeletion"); $settings->_enableVersionDeletion = getBoolValue("enableVersionDeletion");
$settings->_enableVersionModification = getBoolValue("enableVersionModification"); $settings->_enableVersionModification = getBoolValue("enableVersionModification");
$settings->_enableDuplicateDocNames = getBoolValue("enableDuplicateDocNames"); $settings->_enableDuplicateDocNames = getBoolValue("enableDuplicateDocNames");
$settings->_enableDuplicateSubFolderNames = getBoolValue("enableDuplicateSubFolderNames");
$settings->_overrideMimeType = getBoolValue("overrideMimeType"); $settings->_overrideMimeType = getBoolValue("overrideMimeType");
$settings->_removeFromDropFolder = getBoolValue("removeFromDropFolder"); $settings->_removeFromDropFolder = getBoolValue("removeFromDropFolder");

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

@ -430,6 +430,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site'));
<?php $this->showConfigCheckbox('settings_enableVersionDeletion', 'enableVersionDeletion'); ?> <?php $this->showConfigCheckbox('settings_enableVersionDeletion', 'enableVersionDeletion'); ?>
<?php $this->showConfigCheckbox('settings_enableVersionModification', 'enableVersionModification'); ?> <?php $this->showConfigCheckbox('settings_enableVersionModification', 'enableVersionModification'); ?>
<?php $this->showConfigCheckbox('settings_enableDuplicateDocNames', 'enableDuplicateDocNames'); ?> <?php $this->showConfigCheckbox('settings_enableDuplicateDocNames', 'enableDuplicateDocNames'); ?>
<?php $this->showConfigCheckbox('settings_enableDuplicateSubFolderNames', 'enableDuplicateSubFolderNames'); ?>
<?php $this->showConfigCheckbox('settings_overrideMimeType', 'overrideMimeType'); ?> <?php $this->showConfigCheckbox('settings_overrideMimeType', 'overrideMimeType'); ?>
<?php $this->showConfigCheckbox('settings_removeFromDropFolder', 'removeFromDropFolder'); ?> <?php $this->showConfigCheckbox('settings_removeFromDropFolder', 'removeFromDropFolder'); ?>