Author: david
Date: Mon Nov 1 13:46:06 2010
New Revision: 8745
Log:
s/group/resource/g
Modified:
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editTermAclAction.class.php
trunk/plugins/qbAclPlugin/modules/aclGroup/templates/editTermAclSuccess.php
Modified:
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editTermAclAction.class.php
==============================================================================
---
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editTermAclAction.class.php
Mon Nov 1 12:53:17 2010 (r8744)
+++
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editTermAclAction.class.php
Mon Nov 1 13:46:06 2010 (r8745)
@@ -52,13 +52,13 @@
public function execute($request)
{
$this->form = new sfForm;
- $this->group = new QubitAclGroup;
+ $this->resource = new QubitAclGroup;
if (isset($this->request->id))
{
- $this->group = QubitAclGroup::getById($this->request->id);
+ $this->resource = QubitAclGroup::getById($this->request->id);
- if (!isset($this->group))
+ if (!isset($this->resource))
{
$this->forward404();
}
@@ -75,12 +75,12 @@
}
$this->permissions = array();
- if (null != $this->group->id)
+ if (null != $this->resource->id)
{
// Get term permissions for this group
$criteria = new Criteria;
$criteria->addJoin(QubitAclPermission::OBJECT_ID, QubitObject::ID,
Criteria::LEFT_JOIN);
- $criteria->add(QubitAclPermission::GROUP_ID, $this->group->id);
+ $criteria->add(QubitAclPermission::GROUP_ID, $this->resource->id);
$c1 = $criteria->getNewCriterion(QubitAclPermission::OBJECT_ID, null,
Criteria::ISNULL);
$c2 = $criteria->getNewCriterion(QubitObject::CLASS_NAME, 'QubitTerm');
$c1->addOr($c2);
@@ -107,7 +107,7 @@
if ($this->form->isValid())
{
$this->processForm();
- $this->redirect(array($this->group, 'module' => 'aclGroup', 'action'
=> 'indexTermAcl'));
+ $this->redirect(array($this->resource, 'module' => 'aclGroup',
'action' => 'indexTermAcl'));
}
}
}
@@ -121,7 +121,7 @@
}
// Save changes
- $this->group->save();
+ $this->resource->save();
return $this;
}
@@ -157,7 +157,7 @@
$aclPermission->objectId = $params['id'];
}
- $this->group->aclPermissions[] = $aclPermission;
+ $this->resource->aclPermissions[] = $aclPermission;
}
}
@@ -172,7 +172,7 @@
{
$aclPermission->grantDeny = (QubitAcl::GRANT == $value) ? 1 : 0;
- $this->group->aclPermissions[] = $aclPermission;
+ $this->resource->aclPermissions[] = $aclPermission;
}
}
}
Modified:
trunk/plugins/qbAclPlugin/modules/aclGroup/templates/editTermAclSuccess.php
==============================================================================
--- trunk/plugins/qbAclPlugin/modules/aclGroup/templates/editTermAclSuccess.php
Mon Nov 1 12:53:17 2010 (r8744)
+++ trunk/plugins/qbAclPlugin/modules/aclGroup/templates/editTermAclSuccess.php
Mon Nov 1 13:46:06 2010 (r8745)
@@ -1,5 +1,5 @@
<h1><?php echo __('Edit %1% permissions', array('%1%' =>
sfConfig::get('app_ui_label_term'))) ?></h1>
-<h1 class="label"><?php echo $group ?></h1>
+<h1 class="label"><?php echo $resource ?></h1>
-<?php echo get_component('aclGroup', 'termAclForm', array('role' => $group,
'permissions' => $permissions, 'form' => $form)) ?>
+<?php echo get_component('aclGroup', 'termAclForm', array('resource' =>
$resource, 'permissions' => $permissions, 'form' => $form)) ?>
--
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.
