Author: sevein
Date: Wed Oct 27 11:18:26 2010
New Revision: 8553

Log:
Use $resource. Refs issue 1818.

Modified:
   trunk/plugins/sfSkosPlugin/modules/sfSkosPlugin/actions/indexAction.class.php

Modified: 
trunk/plugins/sfSkosPlugin/modules/sfSkosPlugin/actions/indexAction.class.php
==============================================================================
--- 
trunk/plugins/sfSkosPlugin/modules/sfSkosPlugin/actions/indexAction.class.php   
    Wed Oct 27 10:55:07 2010        (r8552)
+++ 
trunk/plugins/sfSkosPlugin/modules/sfSkosPlugin/actions/indexAction.class.php   
    Wed Oct 27 11:18:26 2010        (r8553)
@@ -30,25 +30,25 @@
 {
   public function execute($request)
   {
-    $this->obj = QubitObject::getById($request->id);
+    $this->resource = $this->getRoute()->resource;
 
-    if (null === $this->obj)
+    if (!isset($this->resource))
     {
       $this->forward404();
     }
 
-    if ('QubitTerm' == $this->obj->className)
+    if ('QubitTerm' == $this->resource->className)
     {
-      $term = QubitTerm::getById($request->id);
+      $term = QubitTerm::getById($this->resource->id);
       $this->terms = $term->descendants->andSelf()->orderBy('lft');
       $this->taxonomy = $term->taxonomy;
       $this->topLevelTerms = array($term);
     }
     else
     {
-      $this->terms = QubitTaxonomy::getTaxonomyTerms($request->id);
-      $this->taxonomy = QubitTaxonomy::getById($request->id);
-      $this->topLevelTerms = QubitTaxonomy::getTaxonomyTerms($request->id, 
array('level' => 'top'));
+      $this->terms = QubitTaxonomy::getTaxonomyTerms($this->resource->id);
+      $this->taxonomy = QubitTaxonomy::getById($this->resource->id);
+      $this->topLevelTerms = 
QubitTaxonomy::getTaxonomyTerms($this->resource->id, array('level' => 'top'));
     }
   }
 }

-- 
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.

Reply via email to