Author: david
Date: Fri Oct 29 16:54:37 2010
New Revision: 8699
Log:
Use $resource directly.
Modified:
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editInformationObjectAclAction.class.php
Modified:
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editInformationObjectAclAction.class.php
==============================================================================
---
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editInformationObjectAclAction.class.php
Fri Oct 29 16:52:28 2010 (r8698)
+++
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editInformationObjectAclAction.class.php
Fri Oct 29 16:54:37 2010 (r8699)
@@ -98,15 +98,13 @@
// If key has an underscore, then we are creating a new permission
if (1 == preg_match('/([\w]+)_(.*)/', $key, $matches))
{
- $obj = null;
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))
{
- $obj = QubitObject::getById($params['id']);
+ $obj = $params['_sf_route']->resource;
}
-
- if (null === $obj)
+ else
{
continue;
}
@@ -120,13 +118,13 @@
switch ($obj->className)
{
case 'QubitInformationObject':
- $aclPermission->objectId = $obj->id;
+ $aclPermission->object = $obj;
break;
case 'QubitRepository':
$aclPermission->objectId = QubitInformationObject::ROOT_ID;
-
$aclPermission->setRepository(QubitRepository::getById($obj->id));
+ $aclPermission->setRepository($obj);
break;
--
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.
