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 2022-06-09 16:56:06 +02:00
commit 7a7fca84b4
6 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -239,6 +239,7 @@
- do not use logger in notification service if it was not initialized - do not use logger in notification service if it was not initialized
- fix editing of custom date fields - fix editing of custom date fields
- fix listing files/folders with umlauts when using webdav - fix listing files/folders with umlauts when using webdav
- fix upload with fine-uploader
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 5.1.25 Changes in version 5.1.25

4
SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
View File

@ -130,14 +130,14 @@ class SeedDMS_SQliteFTS_Search {
$querystr .= ' AND '; $querystr .= ' AND ';
$querystr .= '(path:'; $querystr .= '(path:';
$querystr .= str_replace(':', 'x', $fields['rootFolder']->getFolderList().$fields['rootFolder']->getID().':'); $querystr .= str_replace(':', 'x', $fields['rootFolder']->getFolderList().$fields['rootFolder']->getID().':');
$querystr .= ')'; $querystr .= '*)';
} }
if(!empty($fields['startFolder']) && $fields['startFolder']->getFolderList()) { if(!empty($fields['startFolder']) && $fields['startFolder']->getFolderList()) {
if($querystr) if($querystr)
$querystr .= ' AND '; $querystr .= ' AND ';
$querystr .= '(path:'; $querystr .= '(path:';
$querystr .= str_replace(':', 'x', $fields['startFolder']->getFolderList().$fields['startFolder']->getID().':'); $querystr .= str_replace(':', 'x', $fields['startFolder']->getFolderList().$fields['startFolder']->getID().':');
$querystr .= ')'; $querystr .= '*)';
} }
try { try {
$result = $this->index->find($querystr, $limit); $result = $this->index->find($querystr, $limit);

1
SeedDMS_SQLiteFTS/package.xml
View File

@ -24,6 +24,7 @@
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license> <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes> <notes>
- throw exeption in find() instead of returning false - throw exeption in find() instead of returning false
- fix query if rootFolder or startFolder is set
</notes> </notes>
<contents> <contents>
<dir baseinstalldir="SeedDMS" name="/"> <dir baseinstalldir="SeedDMS" name="/">

2
op/op.Ajax.php
View File

@ -1040,7 +1040,7 @@ switch($command) {
$ires = $index->addDocument($idoc); $ires = $index->addDocument($idoc);
header('Content-Type: application/json'); header('Content-Type: application/json');
if(false === $ires) { if(false === $ires) {
echo json_encode(array('success'=>false, 'message'=>getMLText('error_document_indexed'), 'data'=>$prefix.$object->getID())); echo json_encode(array('success'=>false, 'message'=>getMLText('error_document_indexed'), 'data'=>$prefix.$object->getID(), 'mimetype'=>$idoc->getMimeType(), 'cmd'=>$idoc->getCmd()));
} else { } else {
echo json_encode(array('success'=>true, 'message'=>getMLText('splash_document_indexed'), 'data'=>$prefix.$object->getID(), 'cmd'=>$idoc->getCmd())); echo json_encode(array('success'=>true, 'message'=>getMLText('splash_document_indexed'), 'data'=>$prefix.$object->getID(), 'cmd'=>$idoc->getCmd()));
} }

16
views/bootstrap4/class.Bootstrap4.php
View File

@ -3502,11 +3502,13 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
<div class="qq-total-progress-bar-container-selector qq-total-progress-bar-container"> <div class="qq-total-progress-bar-container-selector qq-total-progress-bar-container">
<div role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" class="qq-total-progress-bar-selector qq-progress-bar qq-total-progress-bar"></div> <div role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" class="qq-total-progress-bar-selector qq-progress-bar qq-total-progress-bar"></div>
</div> </div>
<div class="input-append"> <div class="input-group">
<div class="qq-upload-drop-area-selector qq-upload-drop-area" _qq-hide-dropzone> <div class="form-control qq-upload-drop-area-selector qq-upload-drop-area" _qq-hide-dropzone>
<span class="qq-upload-drop-area-text-selector"></span> <span class="qq-upload-drop-area-text-selector"></span>
</div> </div>
<span class="btn qq-upload-button-selector qq-upload-button">'.getMLText('browse').'&hellip;</span> <div class="input-group-append">
<span class="btn btn-secondary qq-upload-button-selector qq-upload-button">'.getMLText('choose_target_file').'&hellip;</span>
</div>
</div> </div>
<span class="qq-drop-processing-selector qq-drop-processing"> <span class="qq-drop-processing-selector qq-drop-processing">
<span class="qq-drop-processing-spinner-selector qq-drop-processing-spinner"></span> <span class="qq-drop-processing-spinner-selector qq-drop-processing-spinner"></span>
@ -3520,22 +3522,22 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
<img class="qq-thumbnail-selector" qq-max-size="100" qq-server-scale> <img class="qq-thumbnail-selector" qq-max-size="100" qq-server-scale>
<span class="qq-upload-file-selector qq-upload-file"></span> <span class="qq-upload-file-selector qq-upload-file"></span>
<span class="qq-upload-size-selector qq-upload-size"></span> <span class="qq-upload-size-selector qq-upload-size"></span>
<button class="btn btn-mini qq-btn qq-upload-cancel-selector qq-upload-cancel">Cancel</button> <button class="btn btn-sm btn-danger qq-btn qq-upload-cancel-selector qq-upload-cancel">Cancel</button>
<span role="status" class="qq-upload-status-text-selector qq-upload-status-text"></span> <span role="status" class="qq-upload-status-text-selector qq-upload-status-text"></span>
</li> </li>
</ul> </ul>
<dialog class="qq-alert-dialog-selector"> <dialog class="qq-alert-dialog-selector">
<div class="qq-dialog-message-selector"></div> <div class="qq-dialog-message-selector"></div>
<div class="qq-dialog-buttons"> <div class="qq-dialog-buttons">
<button class="btn qq-cancel-button-selector">Cancel</button> <button class="btn btn-sm btn-secondary qq-cancel-button-selector">Cancel</button>
</div> </div>
</dialog> </dialog>
<dialog class="qq-confirm-dialog-selector"> <dialog class="qq-confirm-dialog-selector">
<div class="qq-dialog-message-selector"></div> <div class="qq-dialog-message-selector"></div>
<div class="qq-dialog-buttons"> <div class="qq-dialog-buttons">
<button class="btn qq-cancel-button-selector">Cancel</button> <button class="btn btn-sm btn-secondary qq-cancel-button-selector">Cancel</button>
<button class="btn qq-ok-button-selector">Ok</button> <button class="btn btn-sm btn-primary qq-ok-button-selector">Ok</button>
</div> </div>
</dialog> </dialog>

9
views/bootstrap4/styles/application.css
View File

@ -425,15 +425,6 @@ ul.qq-upload-list li span {
display: inline-block; display: inline-block;
} }
.qq-upload-drop-area {
display: inline-block;
width: 200px;
height: 22px;
padding: 3px;
background-color: #fff;
border: 1px solid #cccccc;
border-radius: 4px;
}
.qq-hide, .qq-uploader dialog { .qq-hide, .qq-uploader dialog {
display: none; display: none;
} }