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

show only released documents in ReceiveOwner list

Browse Source
This commit is contained in:
Uwe Steinmann 2018-02-01 12:05:48 +01:00
parent b1ac7d94ac
commit b3c372e270
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1447,6 +1447,7 @@ class SeedDMS_Core_DMS {
if ($docs) { if ($docs) {
$queryStr .= "AND `tblDocuments`.`id` IN (" . implode(',', $docs) . ") "; $queryStr .= "AND `tblDocuments`.`id` IN (" . implode(',', $docs) . ") ";
$queryStr .= "AND `tblDocuments`.`owner` = '".$user->getID()."'"; $queryStr .= "AND `tblDocuments`.`owner` = '".$user->getID()."'";
$queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_RELEASED.") ";
if ($orderby=='e') $queryStr .= "ORDER BY `expires`"; if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`"; else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
else if ($orderby=='s') $queryStr .= "ORDER BY `status`"; else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
@ -1500,8 +1501,8 @@ class SeedDMS_Core_DMS {
$orderdir = 'DESC'; $orderdir = 'DESC';
else else
$orderdir = 'ASC'; $orderdir = 'ASC';
$queryStr .= "AND `tblDocuments`.`owner` = '".$user->getID()."' ". $queryStr .= "AND `tblDocuments`.`owner` = '".$user->getID()."' ";
"AND `tblDocumentStatusLog`.`status` IN (".S_REJECTED.") "; $queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_REJECTED.") ";
//$queryStr .= "ORDER BY `statusDate` DESC"; //$queryStr .= "ORDER BY `statusDate` DESC";
if ($orderby=='e') $queryStr .= "ORDER BY `expires`"; if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`"; else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";