Commit 669862b9d868acb99024097a6669e74e28ceda80
1 parent
d985bf87
Update boolean search criteria for document normalisation
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4637 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
1 changed file
with
7 additions
and
0 deletions
lib/browse/Criteria.inc
| ... | ... | @@ -193,6 +193,7 @@ class BrowseCriterion { |
| 193 | 193 | class NameCriterion extends BrowseCriterion { |
| 194 | 194 | var $bFolderCriterion = true; |
| 195 | 195 | var $bString = true; |
| 196 | + var $sSearchTable = "DC"; | |
| 196 | 197 | function documentDisplay ($oDocument) { |
| 197 | 198 | $aOptions = $this->aOptions; |
| 198 | 199 | if (array_key_exists('displayFullPath', $aOptions)) { |
| ... | ... | @@ -235,6 +236,7 @@ class IDCriterion extends BrowseCriterion { |
| 235 | 236 | class TitleCriterion extends BrowseCriterion { |
| 236 | 237 | var $bFolderCriterion = true; |
| 237 | 238 | var $bString = true; |
| 239 | + var $sSearchTable = "DM"; | |
| 238 | 240 | function documentDisplay ($oDocument) { |
| 239 | 241 | return $oDocument->getName(); |
| 240 | 242 | } |
| ... | ... | @@ -248,6 +250,7 @@ class TitleCriterion extends BrowseCriterion { |
| 248 | 250 | } |
| 249 | 251 | |
| 250 | 252 | class CreatorCriterion extends BrowseCriterion { |
| 253 | + var $sSearchTable = "D"; | |
| 251 | 254 | var $bFolderCriterion = true; |
| 252 | 255 | var $aLookup = array( |
| 253 | 256 | "table" => "users", |
| ... | ... | @@ -285,6 +288,7 @@ class CreatorCriterion extends BrowseCriterion { |
| 285 | 288 | } |
| 286 | 289 | |
| 287 | 290 | class DateCreatedCriterion extends BrowseCriterion { |
| 291 | + var $sSearchTable = "D"; | |
| 288 | 292 | function documentDisplay ($oDocument) { |
| 289 | 293 | return $oDocument->getCreatedDateTime(); |
| 290 | 294 | } |
| ... | ... | @@ -338,6 +342,7 @@ class DateCreatedCriterion extends BrowseCriterion { |
| 338 | 342 | } |
| 339 | 343 | |
| 340 | 344 | class DocumentTypeCriterion extends BrowseCriterion { |
| 345 | + var $sSearchTable = "DM"; | |
| 341 | 346 | var $aLookup = array( |
| 342 | 347 | "table" => "document_types_lookup", |
| 343 | 348 | "field" => "name" |
| ... | ... | @@ -462,6 +467,7 @@ class DateModifiedCriterion extends DateCreatedCriterion { |
| 462 | 467 | } |
| 463 | 468 | |
| 464 | 469 | class SizeCriterion extends BrowseCriterion { |
| 470 | + var $sSearchTable = "DC"; | |
| 465 | 471 | function documentDisplay ($oDocument) { |
| 466 | 472 | return $oDocument->getFileSize(); |
| 467 | 473 | } |
| ... | ... | @@ -503,6 +509,7 @@ class ContentCriterion extends BrowseCriterion { |
| 503 | 509 | } |
| 504 | 510 | |
| 505 | 511 | class WorkflowStateCriterion extends BrowseCriterion { |
| 512 | + var $sSearchTable = "DM"; | |
| 506 | 513 | function documentDisplay ($oDocument) { |
| 507 | 514 | $oState =& KTWorkflowState::getByDocument($oDocument); |
| 508 | 515 | if ($oState) { | ... | ... |