Author: jablko
Date: Tue Oct 26 16:21:11 2010
New Revision: 8519
Log:
Oops, taxonomy is QubitObject, rollback commit 8475, fixes issue 1842
Modified:
trunk/apps/qubit/modules/term/actions/editAction.class.php
Modified: trunk/apps/qubit/modules/term/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/term/actions/editAction.class.php Tue Oct 26
16:03:01 2010 (r8518)
+++ trunk/apps/qubit/modules/term/actions/editAction.class.php Tue Oct 26
16:21:11 2010 (r8519)
@@ -177,7 +177,7 @@
$this->form->setDefault('taxonomy', $this->request->taxonomy);
$params =
$this->context->routing->parse(Qubit::pathInfo($this->request->taxonomy));
- $choices[$this->request->taxonomy] =
QubitTaxonomy::getById($params['id']);
+ $choices[$this->request->taxonomy] = $params['_sf_route']->resource;
}
$this->form->setWidget('taxonomy', new
sfWidgetFormSelect(array('choices' => $choices)));
@@ -310,7 +310,7 @@
if (isset($value))
{
$params = $this->context->routing->parse(Qubit::pathInfo($value));
- $this->resource['parent'] = $params['_sf_route']->resource;
+ $this->resource->parent = $params['_sf_route']->resource;
}
break;
@@ -322,7 +322,7 @@
if (isset($value))
{
$params = $this->context->routing->parse(Qubit::pathInfo($value));
- $this->resource->taxonomyId = $params['id'];
+ $this->resource->taxonomy = $params['_sf_route']->resource;
}
break;
@@ -402,7 +402,7 @@
parent::processForm();
// Check authorization
- if (!QubitAcl::check($this->resource, 'create'))
+ if (!isset($this->getRoute()->resource) &&
!QubitAcl::check($this->resource, 'create'))
{
QubitAcl::forwardUnauthorized();
}
--
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.
