Author: jablko
Date: Sun Oct 24 14:27:32 2010
New Revision: 8435
Log:
Use $route->resource
Modified:
trunk/apps/qubit/modules/term/actions/indexAction.class.php
Modified: trunk/apps/qubit/modules/term/actions/indexAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/term/actions/indexAction.class.php Sun Oct 24
14:21:00 2010 (r8434)
+++ trunk/apps/qubit/modules/term/actions/indexAction.class.php Sun Oct 24
14:27:32 2010 (r8435)
@@ -19,26 +19,40 @@
class TermIndexAction extends sfAction
{
- public function execute($request)
+ public function checkForRepeatedNames($validator, $value)
{
- $this->resource = QubitTerm::getById($request->id);
+ $criteria = new Criteria;
+ $criteria->addJoin(QubitTerm::ID, QubitTermI18n::ID);
+ $criteria->add(QubitTerm::ID, $this->resource->id, Criteria::NOT_EQUAL);
+ $criteria->add(QubitTerm::TAXONOMY_ID, $this->resource->taxonomyId);
+ $criteria->add(QubitTermI18n::CULTURE, $this->context->user->getCulture());
+ $criteria->add(QubitTermI18n::NAME, $value);
+ if (0 < intval(BasePeer::doCount($criteria)->fetchColumn(0)))
+ {
+ throw new sfValidatorError($validator, $this->context->i18n->__('Name -
A term with this name already exists.'));
+ }
+ }
+
+ public function execute($request)
+ {
+ $this->resource = $this->getRoute()->resource;
if (!$this->resource instanceof QubitTerm)
{
$this->forward404();
}
- $request->setAttribute('term', $this->resource);
-
if (QubitAcl::check($this->resource, 'update'))
{
$validatorSchema = new sfValidatorSchema;
+ $values = array();
+
$validatorSchema->name = new sfValidatorCallback(array('callback' =>
array($this, 'checkForRepeatedNames')));
+ $values['name'] = $this->resource->getName(array('cultureFallback' =>
true));
try
{
- $validatorSchema->clean(array(
- 'name' => $this->resource->getName(array('cultureFallback' =>
true))));
+ $validatorSchema->clean($values);
}
catch (sfValidatorErrorSchema $e)
{
@@ -56,19 +70,4 @@
QubitTreeView::addAssets($this->response);
}
-
- public function checkForRepeatedNames($validator, $value)
- {
- $criteria = new Criteria;
- $criteria->addJoin(QubitTerm::ID, QubitTermI18n::ID);
- $criteria->add(QubitTerm::ID, $this->resource->id, Criteria::NOT_EQUAL);
- $criteria->add(QubitTerm::TAXONOMY_ID, $this->resource->taxonomyId);
- $criteria->add(QubitTermI18n::CULTURE, $this->context->user->getCulture());
- $criteria->add(QubitTermI18n::NAME, $value);
-
- if (0 < intval(BasePeer::doCount($criteria)->fetchColumn(0)))
- {
- throw new sfValidatorError($validator, $this->context->i18n->__('Name -
A term with this name already exists.'));
- }
- }
}
--
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.
