From b3c372e2702824082d46d74f6eb163a323125809 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 1 Feb 2018 12:05:48 +0100 Subject: [PATCH] show only released documents in ReceiveOwner list --- SeedDMS_Core/Core/inc.ClassDMS.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php index 23a394f16..7b8903164 100644 --- a/SeedDMS_Core/Core/inc.ClassDMS.php +++ b/SeedDMS_Core/Core/inc.ClassDMS.php @@ -1447,6 +1447,7 @@ class SeedDMS_Core_DMS { if ($docs) { $queryStr .= "AND `tblDocuments`.`id` IN (" . implode(',', $docs) . ") "; $queryStr .= "AND `tblDocuments`.`owner` = '".$user->getID()."'"; + $queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_RELEASED.") "; if ($orderby=='e') $queryStr .= "ORDER BY `expires`"; else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`"; else if ($orderby=='s') $queryStr .= "ORDER BY `status`"; @@ -1500,8 +1501,8 @@ class SeedDMS_Core_DMS { $orderdir = 'DESC'; else $orderdir = 'ASC'; - $queryStr .= "AND `tblDocuments`.`owner` = '".$user->getID()."' ". - "AND `tblDocumentStatusLog`.`status` IN (".S_REJECTED.") "; + $queryStr .= "AND `tblDocuments`.`owner` = '".$user->getID()."' "; + $queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_REJECTED.") "; //$queryStr .= "ORDER BY `statusDate` DESC"; if ($orderby=='e') $queryStr .= "ORDER BY `expires`"; else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";