gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-06 15:14:58 +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 2020-05-27 16:24:43 +02:00
commit 6773f93e11
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -164,6 +164,8 @@
- fix creating preview images of documents in drop folder
- fix list of expired documents in admin tools (Closes: #474)
- 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

8
views/bootstrap/class.ViewFolder.php
View File

@ -434,9 +434,13 @@ $('body').on('click', '.order-btn', function(ev) {
$folder = $this->params['folder'];
$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>
<?php
} else {
$this->errorMsg(getMLText('access_denied'));
}
} /* }}} */
function entries() { /* {{{ */
@ -588,7 +592,7 @@ $('body').on('click', '.order-btn', function(ev) {
}
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=\"span8\">";
}
@ -597,7 +601,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>
<?php
if ($enableDropUpload && $folder->getAccessMode($user) >= M_READWRITE) {
if ($enableDropUpload/* && $folder->getAccessMode($user) >= M_READWRITE*/) {
echo "</div>";
echo "<div class=\"span4\">";
// $this->dropUpload();