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

show fulltext search tab if fulltext search was used

Browse Source
This commit is contained in:
Uwe Steinmann 2021-11-10 08:33:52 +01:00
parent 96310c40c2
commit 5049169d09
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
out/out.Search.php
View File

@ -51,7 +51,8 @@ if (isset($_GET["navBar"])) {
$accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings);
if(((!isset($_GET["fullsearch"]) && $settings->_defaultSearchMethod == 'fulltext') || !empty($_GET["fullsearch"])) && $settings->_enableFullSearch) {
$fullsearch = ((!isset($_GET["fullsearch"]) && $settings->_defaultSearchMethod == 'fulltext') || !empty($_GET["fullsearch"])) && $settings->_enableFullSearch;
if($fullsearch) {
// Search in Fulltext {{{
if (isset($_GET["query"]) && is_string($_GET["query"])) {
$query = $_GET["query"];
@ -535,7 +536,7 @@ if($settings->_showSingleSearchHit && count($entries) == 1) {
$view->setParam('total', $total);
$view->setParam('totaldocs', $dcount /*resArr['totalDocs']*/);
$view->setParam('totalfolders', $fcount /*resArr['totalFolders']*/);
$view->setParam('fullsearch', (!empty($_GET["fullsearch"]) && $settings->_enableFullSearch) ? true : false);
$view->setParam('fullsearch', $fullsearch);
$view->setParam('mode', isset($mode) ? $mode : '');
$view->setParam('orderby', isset($orderby) ? $orderby : '');
$view->setParam('defaultsearchmethod', !empty($_GET["fullsearch"]) || $settings->_defaultSearchMethod);

5
views/bootstrap/class.Search.php
View File

@ -173,9 +173,10 @@ function typeahead() { /* {{{ */
$this->rowStart();
$this->columnStart(4);
$this->contentHeading("<button class=\"btn btn-primary\" id=\"searchform-toggle\" data-toggle=\"collapse\" href=\"#searchform\"><i class=\"fa fa-exchange\"></i></button> ".getMLText('search'), true);
//$this->contentHeading("<button class=\"btn btn-primary\" id=\"searchform-toggle\" data-toggle=\"collapse\" href=\"#searchform\"><i class=\"fa fa-exchange\"></i></button> ".getMLText('search'), true);
$this->contentHeading(getMLText('search'), true);
if($this->query) {
echo "<div id=\"searchform\" class=\"collapse mb-sm-4\">";
echo "<div id=\"searchform\" class=\"_collapse mb-sm-4\">";
}
?>
<ul class="nav nav-pills" id="searchtab">