Author: david
Date: Thu Oct 15 15:47:07 2009
New Revision: 3759
Log:
Add explicit joins to q_object table to return correct number of results. Fixes
issue #1061.
Modified:
trunk/apps/qubit/modules/search/actions/recentUpdatesAction.class.php
trunk/lib/model/QubitRepository.php
Modified: trunk/apps/qubit/modules/search/actions/recentUpdatesAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/search/actions/recentUpdatesAction.class.php
Thu Oct 15 14:54:27 2009 (r3758)
+++ trunk/apps/qubit/modules/search/actions/recentUpdatesAction.class.php
Thu Oct 15 15:47:07 2009 (r3759)
@@ -70,6 +70,7 @@
$nameColumn = 'name';
$this->nameColumnDisplay = 'name';
$criteria = QubitTerm::addRecentUpdatesCriteria($criteria,
$cutOffDate);
+ $criteria->addJoin(QubitObject::ID, QubitTerm::ID);
break;
case 'informationobject':
default:
@@ -79,6 +80,7 @@
// Hide root
$criteria->add(QubitInformationObject::PARENT_ID, null,
Criteria::ISNOTNULL);
+ $criteria->addJoin(QubitObject::ID, QubitInformationObject::ID);
$criteria =
QubitInformationObject::addRecentUpdatesCriteria($criteria, $cutOffDate);
}
Modified: trunk/lib/model/QubitRepository.php
==============================================================================
--- trunk/lib/model/QubitRepository.php Thu Oct 15 14:54:27 2009 (r3758)
+++ trunk/lib/model/QubitRepository.php Thu Oct 15 15:47:07 2009 (r3759)
@@ -165,8 +165,8 @@
*/
public static function addGetOnlyRepositoryCriteria($criteria)
{
- $criteria->add(QubitRepository::ID, null, Criteria::ISNOTNULL);
- $criteria->addJoin(QubitRepository::ID, QubitActor::ID,
Criteria::INNER_JOIN);
+ $criteria->addJoin(QubitRepository::ID, QubitObject::ID);
+ $criteria->add(QubitObject::CLASS_NAME, 'QubitRepository');
return $criteria;
}
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.ca/group/qubit-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
