show fast upload always but check for write access

This commit is contained in:
Uwe Steinmann 2020-05-27 16:23:19 +02:00
parent b4e44583d0
commit aa55ed3bcb
2 changed files with 8 additions and 2 deletions

View File

@ -14,6 +14,8 @@
- fix creating preview images of documents in drop folder - fix creating preview images of documents in drop folder
- fix list of expired documents in admin tools (Closes: #474) - fix list of expired documents in admin tools (Closes: #474)
- list of expired documents can be sorted - list of expired documents can be sorted
- show 'fast upload' always (if turned on), but issue an error msg if the
current folder is not writable
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 5.1.16 Changes in version 5.1.16

View File

@ -440,9 +440,13 @@ $('body').on('click', '.order-btn', function(ev) {
$folder = $this->params['folder']; $folder = $this->params['folder'];
$this->contentHeading(getMLText("dropupload"), true); $this->contentHeading(getMLText("dropupload"), true);
if ($folder->getAccessMode($user) >= M_READWRITE) {
?> ?>
<div id="dragandrophandler" class="well alert" data-droptarget="folder_<?php echo $folder->getID(); ?>" data-target="<?php echo $folder->getID(); ?>" data-uploadformtoken="<?php echo createFormKey(''); ?>"><?php printMLText('drop_files_here'); ?></div> <div id="dragandrophandler" class="well alert" data-droptarget="folder_<?php echo $folder->getID(); ?>" data-target="<?php echo $folder->getID(); ?>" data-uploadformtoken="<?php echo createFormKey(''); ?>"><?php printMLText('drop_files_here'); ?></div>
<?php <?php
} else {
$this->errorMsg(getMLText('access_denied'));
}
} /* }}} */ } /* }}} */
function entries() { /* {{{ */ function entries() { /* {{{ */
@ -594,7 +598,7 @@ $('body').on('click', '.order-btn', function(ev) {
} }
echo "<div class=\"span".$RightColumnSpan."\">\n"; echo "<div class=\"span".$RightColumnSpan."\">\n";
if ($enableDropUpload && $folder->getAccessMode($user) >= M_READWRITE) { if ($enableDropUpload/* && $folder->getAccessMode($user) >= M_READWRITE*/) {
echo "<div class=\"row-fluid\">"; echo "<div class=\"row-fluid\">";
echo "<div class=\"span8\">"; echo "<div class=\"span8\">";
} }
@ -603,7 +607,7 @@ $('body').on('click', '.order-btn', function(ev) {
?> ?>
<div class="ajax" data-view="ViewFolder" data-action="folderInfos" data-no-spinner="true" <?php echo ($folder ? "data-query=\"folderid=".$folder->getID()."\"" : "") ?>></div> <div class="ajax" data-view="ViewFolder" data-action="folderInfos" data-no-spinner="true" <?php echo ($folder ? "data-query=\"folderid=".$folder->getID()."\"" : "") ?>></div>
<?php <?php
if ($enableDropUpload && $folder->getAccessMode($user) >= M_READWRITE) { if ($enableDropUpload/* && $folder->getAccessMode($user) >= M_READWRITE*/) {
echo "</div>"; echo "</div>";
echo "<div class=\"span4\">"; echo "<div class=\"span4\">";
// $this->dropUpload(); // $this->dropUpload();