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

Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2016-02-17 11:39:09 +01:00
commit 0f991c2dc1
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
out/out.Search.php
View File

@ -371,7 +371,6 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
if($resArr['folders']) { if($resArr['folders']) {
foreach ($resArr['folders'] as $entry) { foreach ($resArr['folders'] as $entry) {
if ($entry->getAccessMode($user) >= M_READ) { if ($entry->getAccessMode($user) >= M_READ) {
$entry->verifyLastestContentExpriry();
$entries[] = $entry; $entries[] = $entry;
$fcount++; $fcount++;
} }
@ -381,6 +380,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
if($resArr['docs']) { if($resArr['docs']) {
foreach ($resArr['docs'] as $entry) { foreach ($resArr['docs'] as $entry) {
if ($entry->getAccessMode($user) >= M_READ) { if ($entry->getAccessMode($user) >= M_READ) {
$entry->verifyLastestContentExpriry();
$entries[] = $entry; $entries[] = $entry;
$dcount++; $dcount++;
} }

6
views/bootstrap/class.Bootstrap.php
View File

@ -936,11 +936,10 @@ $(document).ready(function () {
function printDocumentChooserJs($formName) { /* {{{ */ function printDocumentChooserJs($formName) { /* {{{ */
?> ?>
modalDocChooser<?php echo $formName ?> = $('#docChooser<?php echo $formName ?>');
function documentSelected<?php echo $formName ?>(id, name) { function documentSelected<?php echo $formName ?>(id, name) {
$('#docid<?php echo $formName ?>').val(id); $('#docid<?php echo $formName ?>').val(id);
$('#choosedocsearch').val(name); $('#choosedocsearch').val(name);
modalDocChooser<?php echo $formName ?>.modal('hide'); $('#docChooser<?php echo $formName ?>').modal('hide');
} }
function folderSelected<?php echo $formName ?>(id, name) { function folderSelected<?php echo $formName ?>(id, name) {
} }
@ -985,11 +984,10 @@ function folderSelected<?php echo $formName ?>(id, name) {
function printFolderChooserJs($formName) { /* {{{ */ function printFolderChooserJs($formName) { /* {{{ */
?> ?>
modalFolderChooser<?php echo $formName ?> = $('#folderChooser<?php echo $formName ?>');
function folderSelected<?php echo $formName ?>(id, name) { function folderSelected<?php echo $formName ?>(id, name) {
$('#targetid<?php echo $formName ?>').val(id); $('#targetid<?php echo $formName ?>').val(id);
$('#choosefoldersearch<?php echo $formName ?>').val(name); $('#choosefoldersearch<?php echo $formName ?>').val(name);
modalFolderChooser<?php echo $formName ?>.modal('hide'); $('#folderChooser<?php echo $formName ?>').modal('hide');
} }
<?php <?php
} /* }}} */ } /* }}} */