Author: jablko
Date: Sun Oct 24 12:31:00 2010
New Revision: 8421
Log:
Use $route->resource
Modified:
trunk/apps/qubit/modules/actor/actions/autocompleteAction.class.php
trunk/apps/qubit/modules/function/actions/autocompleteAction.class.php
trunk/apps/qubit/modules/function/actions/deleteAction.class.php
trunk/apps/qubit/modules/function/actions/listAction.class.php
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedFunctionComponent.class.php
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedResourceComponent.class.php
Modified: trunk/apps/qubit/modules/actor/actions/autocompleteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/actor/actions/autocompleteAction.class.php Sun Oct
24 12:25:13 2010 (r8420)
+++ trunk/apps/qubit/modules/actor/actions/autocompleteAction.class.php Sun Oct
24 12:31:00 2010 (r8421)
@@ -39,7 +39,7 @@
if (isset($request->query))
{
- $criteria->add(QubitActorI18n::AUTHORIZED_FORM_OF_NAME,
$request->query.'%', Criteria::LIKE);
+ $criteria->add(QubitActorI18n::AUTHORIZED_FORM_OF_NAME,
"$request->query%", Criteria::LIKE);
}
// Exclude the calling actor from the list
Modified: trunk/apps/qubit/modules/function/actions/autocompleteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/function/actions/autocompleteAction.class.php
Sun Oct 24 12:25:13 2010 (r8420)
+++ trunk/apps/qubit/modules/function/actions/autocompleteAction.class.php
Sun Oct 24 12:31:00 2010 (r8421)
@@ -36,13 +36,12 @@
$criteria = new Criteria;
$criteria->addJoin(QubitFunction::ID, QubitFunctionI18n::ID);
- $criteria->add(QubitFunction::ID, null, Criteria::ISNOTNULL);
+ $criteria->add(QubitFunctionI18n::CULTURE,
$this->context->user->getCulture());
if (isset($request->query))
{
- $criteria->add(QubitFunctionI18n::AUTHORIZED_FORM_OF_NAME,
$request->query.'%', Criteria::LIKE);
+ $criteria->add(QubitFunctionI18n::AUTHORIZED_FORM_OF_NAME,
"$request->query%", Criteria::LIKE);
}
- $criteria->add(QubitFunctionI18n::CULTURE,
$this->context->user->getCulture());
// Exclude the calling function from the list
$params =
$this->context->routing->parse(Qubit::pathInfo($request->getReferer()));
@@ -56,9 +55,7 @@
$this->pager->setCriteria($criteria);
$this->pager->setMaxPerPage($request->limit);
$this->pager->setPage(1);
- $this->pager->init();
$this->setTemplate('list');
}
}
-
Modified: trunk/apps/qubit/modules/function/actions/deleteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/function/actions/deleteAction.class.php Sun Oct
24 12:25:13 2010 (r8420)
+++ trunk/apps/qubit/modules/function/actions/deleteAction.class.php Sun Oct
24 12:31:00 2010 (r8421)
@@ -23,9 +23,9 @@
{
$this->form = new sfForm;
- $this->func = QubitFunction::getById($request->id);
+ $this->resource = QubitFunction::getById($request->id);
- if (!isset($this->func))
+ if (!isset($this->resource))
{
$this->forward404();
}
@@ -33,12 +33,12 @@
if ($request->isMethod('delete'))
{
// Delete relationships
- foreach (QubitRelation::getBySubjectOrObjectId($this->func->id) as
$relation)
+ foreach (QubitRelation::getBySubjectOrObjectId($this->resource->id) as
$relation)
{
$relation->delete();
}
- $this->func->delete();
+ $this->resource->delete();
$this->redirect(array('module' => 'function', 'action' => 'browse'));
}
Modified: trunk/apps/qubit/modules/function/actions/listAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/function/actions/listAction.class.php Sun Oct
24 12:25:13 2010 (r8420)
+++ trunk/apps/qubit/modules/function/actions/listAction.class.php Sun Oct
24 12:31:00 2010 (r8421)
@@ -35,14 +35,13 @@
}
$criteria = new Criteria;
- $criteria->addJoin(QubitObject::ID, QubitFunction::ID);
$criteria->addDescendingOrderByColumn(QubitObject::UPDATED_AT);
if (isset($request->subquery))
{
$criteria->addJoin(QubitFunction::ID, QubitFunctionI18n::ID);
- $criteria->add(QubitFunctionI18n::AUTHORIZED_FORM_OF_NAME,
'%'.$request->subquery.'%', Criteria::LIKE);
$criteria->add(QubitFunctionI18n::CULTURE,
$this->context->user->getCulture());
+ $criteria->add(QubitFunctionI18n::AUTHORIZED_FORM_OF_NAME,
"%$request->subquery%", Criteria::LIKE);
}
// Page results
Modified:
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedFunctionComponent.class.php
==============================================================================
---
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedFunctionComponent.class.php
Sun Oct 24 12:25:13 2010 (r8420)
+++
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedFunctionComponent.class.php
Sun Oct 24 12:31:00 2010 (r8421)
@@ -97,20 +97,5 @@
parent::execute($request);
$this->form->getWidgetSchema()->setNameFormat('relatedFunction[%s]');
-
- // Find function to function relations with current function as subject or
- // object
- $criteria = new Criteria;
- $criterion1 = $criteria->getNewCriterion(QubitRelation::OBJECT_ID,
$this->resource->id);
- $criterion2 = $criteria->getNewCriterion(QubitRelation::SUBJECT_ID,
$this->resource->id);
- $criterion1->addOr($criterion2);
- $criteria->add($criterion1);
- $criteria->addAlias('ro', QubitFunction::TABLE_NAME);
- $criteria->addJoin(QubitRelation::OBJECT_ID, 'ro.id');
- $criteria->addAlias('rs', QubitFunction::TABLE_NAME);
- $criteria->addJoin(QubitRelation::SUBJECT_ID, 'rs.id');
- $criteria->addAscendingOrderByColumn(QubitRelation::TYPE_ID);
-
- $this->relations = QubitRelation::get($criteria);
}
}
Modified:
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedResourceComponent.class.php
==============================================================================
---
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedResourceComponent.class.php
Sun Oct 24 12:25:13 2010 (r8420)
+++
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedResourceComponent.class.php
Sun Oct 24 12:31:00 2010 (r8421)
@@ -33,12 +33,5 @@
parent::execute($request);
$this->form->getWidgetSchema()->setNameFormat('relatedResource[%s]');
-
- // Get information objects (object) related to this function (subject)
- $criteria = new Criteria;
- $criteria->add(QubitRelation::SUBJECT_ID, $this->resource->id);
- $criteria->addJoin(QubitRelation::OBJECT_ID, QubitInformationObject::ID);
-
- $this->relations = QubitRelation::get($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.com/group/qubit-commits?hl=en.
