Author: david
Date: Mon Nov 1 14:17:37 2010
New Revision: 8749
Log:
Use routing->parse() to get $resource. Refs issue #1867.
Modified:
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editTermAclAction.class.php
Modified:
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editTermAclAction.class.php
==============================================================================
---
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editTermAclAction.class.php
Mon Nov 1 14:14:37 2010 (r8748)
+++
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editTermAclAction.class.php
Mon Nov 1 14:17:37 2010 (r8749)
@@ -135,7 +135,11 @@
{
list ($action, $uri) = array_slice($matches, 1, 2);
$params = $this->context->routing->parse(Qubit::pathInfo($uri));
- if (!isset($params['id']))
+ if (isset($params['_sf_route']->resource))
+ {
+ $resource = $params['_sf_route']->resource;
+ }
+ else
{
continue;
}
@@ -150,11 +154,11 @@
{
// Taxonomy specific rules
$aclPermission->objectId = QubitTerm::ROOT_ID;
- $aclPermission->setTaxonomy(QubitTaxonomy::getById($params['id']));
+ $aclPermission->setTaxonomy($resource);
}
else
{
- $aclPermission->objectId = $params['id'];
+ $aclPermission->object = $resource;
}
$this->resource->aclPermissions[] = $aclPermission;
--
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.
