From 10a8b14effb2e96e2f14eb2e0eabe3179e4ac2d7 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 4 Nov 2016 20:28:22 +0100 Subject: [PATCH] take out search for reception --- SeedDMS_Core/Core/inc.ClassDMS.php | 8 ++++---- out/out.Search.php | 1 + views/bootstrap/class.Search.php | 2 ++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php index b835b331b..26a6a19e2 100644 --- a/SeedDMS_Core/Core/inc.ClassDMS.php +++ b/SeedDMS_Core/Core/inc.ClassDMS.php @@ -1431,11 +1431,11 @@ class SeedDMS_Core_DMS { "LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion` = `tblDocumentStatus`.`version` AND `ttcontentid`.`document` = `tblDocumentStatus`.`documentID` ". "LEFT JOIN `tblDocumentLocks` ON `tblDocuments`.`id`=`tblDocumentLocks`.`document` ". "LEFT JOIN `tblDocumentCategory` ON `tblDocuments`.`id`=`tblDocumentCategory`.`documentID` ". - "LEFT JOIN `tblDocumentRecipients` ON `tblDocuments`.`id`=`tblDocumentRecipients`.`documentID` ". - "LEFT JOIN `tblDocumentReceiptLog` ON `tblDocumentRecipients`.`receiptID`=`tblDocumentReceiptLog`.`receiptID` ". - "LEFT JOIN `ttreceiptid` ON `ttreceiptid`.`maxLogID` = `tblDocumentReceiptLog`.`receiptLogID` ". +// "LEFT JOIN `tblDocumentRecipients` ON `tblDocuments`.`id`=`tblDocumentRecipients`.`documentID` ". +// "LEFT JOIN `tblDocumentReceiptLog` ON `tblDocumentRecipients`.`receiptID`=`tblDocumentReceiptLog`.`receiptID` ". +// "LEFT JOIN `ttreceiptid` ON `ttreceiptid`.`maxLogID` = `tblDocumentReceiptLog`.`receiptLogID` ". "WHERE `ttstatid`.`maxLogID`=`tblDocumentStatusLog`.`statusLogID` ". - "AND `ttreceiptid`.`maxLogID`=`tblDocumentReceiptLog`.`receiptLogID` ". +// "AND `ttreceiptid`.`maxLogID`=`tblDocumentReceiptLog`.`receiptLogID` ". "AND `ttcontentid`.`maxVersion` = `tblDocumentContent`.`version`"; if (strlen($searchKey)>0) { diff --git a/out/out.Search.php b/out/out.Search.php index 5d3ac2e4f..7f0802a5f 100644 --- a/out/out.Search.php +++ b/out/out.Search.php @@ -161,6 +161,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe $searchTime = getTime() - $startTime; $searchTime = round($searchTime, 2); } + $reception = array(); // }}} } else { // Search in Database {{{ diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php index 659b70589..08ef34282 100644 --- a/views/bootstrap/class.Search.php +++ b/views/bootstrap/class.Search.php @@ -370,6 +370,7 @@ $(document).ready( function() { + : @@ -378,6 +379,7 @@ $(document).ready( function() { + :