Peter M. Groen / knowledgetree

Commit a72ca98d0a4be1348b14cc952e6f13dfe8a0156c

Authored by Neil Blakey-Milner
1 parent 5d355730

BrowseQuery should only show live documents. 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4068 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 9 additions and 5 deletions
lib/browse/PartialQuery.inc.php
  View file @a72ca98
... ... @@ -65,7 +65,7 @@ class BrowseQuery extends PartialQuery{
65 65  
66 66 function getDocumentCount() {
67 67 // FIXME add permission checks here
68   - $sQuery = "SELECT count(id) AS c FROM " . KTUtil::getTableName("documents") . " WHERE folder_id = ? ";
  68 + $sQuery = "SELECT count(id) AS c FROM " . KTUtil::getTableName("documents") . " WHERE folder_id = ? AND D.status_id = 1 ";
69 69 $aParams = array($this->folder_id);
70 70  
71 71 return DBUtil::getOneResultKey(array($sQuery, $aParams), 'c'); // FIXME is this right?
... ... @@ -81,7 +81,9 @@ class BrowseQuery extends PartialQuery{
81 81  
82 82 if ($sJoinClause !== null) {
83 83 $sQuery .= $sJoinClause;
84   - foreach ($aJoinParams as $param) { $aParams[] = $param; } // FIXME use merge...
  84 + foreach ($aJoinParams as $param) {
  85 + $aParams[] = $param;
  86 + } // FIXME use merge...
85 87 }
86 88  
87 89 $sQuery .= " ORDER BY " . $sSortColumn . " " . $sSortOrder . " ";
... ... @@ -102,12 +104,14 @@ class BrowseQuery extends PartialQuery{
102 104 $aParams = array(); // main parameter array.
103 105 $aJoinParams = array($aJoinParams);
104 106  
105   - $sQuery = "SELECT id FROM " . KTUtil::getTableName("documents") . " AS D WHERE folder_id = ? ";
  107 + $sQuery = "SELECT id FROM " . KTUtil::getTableName("documents") . " AS D WHERE folder_id = ? AND D.status_id = 1 ";
106 108 $aParams = array($this->folder_id);
107 109  
108 110 if ($sJoinClause !== null) {
109 111 $sQuery .= $sJoinClause;
110   - foreach ($aJoinParams as $param) { $aParams[] = $param; } // FIXME use merge...
  112 + foreach ($aJoinParams as $param) {
  113 + $aParams[] = $param;
  114 + } // FIXME use merge...
111 115 }
112 116  
113 117 $sQuery .= " ORDER BY " . $sSortColumn . " " . $sSortOrder . " ";
... ... @@ -211,4 +215,4 @@ class SimpleSearchQuery extends PartialQuery {
211 215 }
212 216 }
213 217  
214   -?>
215 218 \ No newline at end of file
  219 +?>
... ...