gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-31 05:57:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

take out search for reception

Browse Source
This commit is contained in:
Uwe Steinmann 2016-11-04 20:28:22 +01:00
parent 42bb8b4bf6
commit 10a8b14eff
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SeedDMS_Core/Core/inc.ClassDMS.php
View File

@ -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) {

1
out/out.Search.php
View File

@ -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 {{{

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

@ -370,6 +370,7 @@ $(document).ready( function() {
<label class="checkbox" for='expired'><input type="checkbox" id="expired" name="expired" value="1" <?php echo in_array(S_EXPIRED, $status) ? "checked" : ""; ?>><?php printOverallStatusText(S_EXPIRED);?></label>
</td>
</tr>
<?php /* ?>
<tr>
<td><?php printMLText("reception");?>:</td>
<td>
@ -378,6 +379,7 @@ $(document).ready( function() {
<label class="checkbox" for='reception'><input type="checkbox" id="reception" name="reception[]" value="1" <?php echo in_array(1, $reception) ? "checked" : ""; ?>><?php printMLText('reception_acknowleged'); ?></label>
</td>
</tr>
<?php */ ?>
<tr>
<td><?php printMLText("expires");?>:</td>
<td>