Author: sevein
Date: Wed Oct 27 12:03:53 2010
New Revision: 8561
Log:
Use $resource, refs issue 1844.
Modified:
trunk/plugins/sfSkosPlugin/modules/sfSkosPlugin/actions/importAction.class.php
Modified:
trunk/plugins/sfSkosPlugin/modules/sfSkosPlugin/actions/importAction.class.php
==============================================================================
---
trunk/plugins/sfSkosPlugin/modules/sfSkosPlugin/actions/importAction.class.php
Wed Oct 27 12:02:51 2010 (r8560)
+++
trunk/plugins/sfSkosPlugin/modules/sfSkosPlugin/actions/importAction.class.php
Wed Oct 27 12:03:53 2010 (r8561)
@@ -22,27 +22,30 @@
public function execute($request)
{
$this->form = new sfForm;
+
$this->timer = new QubitTimer;
$this->terms = array();
$this->termsPerPage = intval(sfConfig::get('app_hits_per_page'));
$this->taxonomy = null;
$this->parent = QubitTerm::getById(QubitTerm::ROOT_ID);
-
- if (isset($request->id) && null !== $obj =
QubitObject::getById($request->id))
+
+ if (isset($this->getRoute()->resource))
{
- if ('QubitTaxonomy' == $obj->className)
+ $resource = $this->getRoute()->resource;
+
+ if ('QubitTaxonomy' == $resource->className)
{
- $this->taxonomy = QubitTaxonomy::getById($obj->id);
+ $this->taxonomy = QubitTaxonomy::getById($resource->id);
}
else
{
- $this->parent = QubitTerm::getById($obj->id);
+ $this->parent = QubitTerm::getById($resource->id);
$this->taxonomy = $this->parent->taxonomy;
}
}
- if (null === $this->taxonomy)
+ if (!isset($this->taxonomy))
{
$this->forward404();
}
--
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.
