Author: david
Date: Fri Oct 23 21:57:06 2009
New Revision: 3823
Log:
Oops, rollback r3822
Modified:
trunk/plugins/qbAclPlugin/lib/QubitAcl.class.php
Modified: trunk/plugins/qbAclPlugin/lib/QubitAcl.class.php
==============================================================================
--- trunk/plugins/qbAclPlugin/lib/QubitAcl.class.php Fri Oct 23 21:55:51
2009 (r3822)
+++ trunk/plugins/qbAclPlugin/lib/QubitAcl.class.php Fri Oct 23 21:57:06
2009 (r3823)
@@ -467,6 +467,7 @@
public static function searchFilterByRepository($query, $action)
{
+ $deniedRepositories = array();
$repositoryAccess = QubitAcl::getRepositoryAccess($action);
if (1 == count($repositoryAccess))
{
@@ -484,6 +485,10 @@
if ('*' != $repo['id'])
{
$subquery->addTerm(new Zend_Search_Lucene_Index_Term($repo['id'],
'repositoryid'));
+ if (QubitAcl::DENY == $repo['access'])
+ {
+ $deniedRepositories[] = $repo['id'];
+ }
}
else
{
@@ -529,6 +534,12 @@
{
while ($repo = array_shift($repositoryViewDrafts))
{
+ // Don't bother excluding repos (again) that have no read access at
all
+ if (in_array($repo['id'], $deniedRepositories))
+ {
+ continue;
+ }
+
$subquery = new Zend_Search_Lucene_Search_Query_MultiTerm();
$subquery->addTerm(new Zend_Search_Lucene_Index_Term($repo['id'],
'repositoryid'), true);
$subquery->addTerm(new
Zend_Search_Lucene_Index_Term(QubitTerm::PUBLICATION_STATUS_DRAFT_ID,
'publicationStatusId'), true);
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
