Author: sevein
Date: Wed Sep 21 15:52:01 2011
New Revision: 9781
Log:
Redirect to browser when ->subquery is not set, fixes issue 2084
Modified:
trunk/apps/qubit/modules/actor/actions/listAction.class.php
trunk/apps/qubit/modules/function/actions/listAction.class.php
trunk/apps/qubit/modules/repository/actions/listAction.class.php
trunk/apps/qubit/modules/rightsholder/actions/listAction.class.php
trunk/plugins/qtAccessionPlugin/modules/donor/actions/listAction.class.php
Modified: trunk/apps/qubit/modules/actor/actions/listAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/actor/actions/listAction.class.php Wed Sep 21
15:50:17 2011 (r9780)
+++ trunk/apps/qubit/modules/actor/actions/listAction.class.php Wed Sep 21
15:52:01 2011 (r9781)
@@ -49,6 +49,10 @@
return;
}
}
+ else
+ {
+ $this->redirect(array('module' => 'actor', 'action' => 'browse'));
+ }
$query->addSubquery(QubitSearch::getInstance()->addTerm('QubitActor',
'className'), true);
$query = QubitAcl::searchFilterByResource($query,
QubitActor::getById(QubitActor::ROOT_ID));
Modified: trunk/apps/qubit/modules/function/actions/listAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/function/actions/listAction.class.php Wed Sep
21 15:50:17 2011 (r9780)
+++ trunk/apps/qubit/modules/function/actions/listAction.class.php Wed Sep
21 15:52:01 2011 (r9781)
@@ -43,6 +43,10 @@
$criteria->add(QubitFunctionI18n::CULTURE,
$this->context->user->getCulture());
$criteria->add(QubitFunctionI18n::AUTHORIZED_FORM_OF_NAME,
"%$request->subquery%", Criteria::LIKE);
}
+ else
+ {
+ $this->redirect(array('module' => 'function', 'action' => 'browse'));
+ }
// Page results
$this->pager = new QubitPager('QubitFunction');
Modified: trunk/apps/qubit/modules/repository/actions/listAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/repository/actions/listAction.class.php Wed Sep
21 15:50:17 2011 (r9780)
+++ trunk/apps/qubit/modules/repository/actions/listAction.class.php Wed Sep
21 15:52:01 2011 (r9781)
@@ -46,6 +46,10 @@
return;
}
}
+ else
+ {
+ $this->redirect(array('module' => 'repository', 'action' => 'browse'));
+ }
$query->addSubquery(QubitSearch::getInstance()->addTerm('QubitRepository',
'className'), true);
Modified: trunk/apps/qubit/modules/rightsholder/actions/listAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/rightsholder/actions/listAction.class.php Wed Sep
21 15:50:17 2011 (r9780)
+++ trunk/apps/qubit/modules/rightsholder/actions/listAction.class.php Wed Sep
21 15:52:01 2011 (r9781)
@@ -45,6 +45,10 @@
return;
}
}
+ else
+ {
+ $this->redirect(array('module' => 'rightsholder', 'action' => 'browse'));
+ }
$query->addSubquery(QubitSearch::getInstance()->addTerm('QubitRightsHolder',
'className'), true);
Modified:
trunk/plugins/qtAccessionPlugin/modules/donor/actions/listAction.class.php
==============================================================================
--- trunk/plugins/qtAccessionPlugin/modules/donor/actions/listAction.class.php
Wed Sep 21 15:50:17 2011 (r9780)
+++ trunk/plugins/qtAccessionPlugin/modules/donor/actions/listAction.class.php
Wed Sep 21 15:52:01 2011 (r9781)
@@ -45,6 +45,10 @@
return;
}
}
+ else
+ {
+ $this->redirect(array('module' => 'donor', 'action' => 'browse'));
+ }
$query->addSubquery(QubitSearch::getInstance()->addTerm('QubitDonor',
'className'), 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.com/group/qubit-commits?hl=en.
