Author: david
Date: Mon Nov 1 15:07:44 2010
New Revision: 8753
Log:
s/group/resource/g
Modified:
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editActorAclAction.class.php
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editDefaultAclAction.class.php
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editInformationObjectAclAction.class.php
trunk/plugins/qbAclPlugin/modules/aclGroup/templates/editActorAclSuccess.php
trunk/plugins/qbAclPlugin/modules/aclGroup/templates/editInformationObjectAclSuccess.php
Modified:
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editActorAclAction.class.php
==============================================================================
---
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editActorAclAction.class.php
Mon Nov 1 15:00:53 2010 (r8752)
+++
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editActorAclAction.class.php
Mon Nov 1 15:07:44 2010 (r8753)
@@ -30,10 +30,10 @@
// Always include root actor permissions
$this->actors = array(QubitActor::ROOT_ID => null);
- // Get actor permissions for this group
+ // Get actor permissions for this resource
$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, 'QubitActor');
$c1->addOr($c2);
@@ -58,7 +58,7 @@
if ($this->form->isValid())
{
$this->processForm();
- $this->redirect(array($this->group, 'module' => 'aclGroup', 'action'
=> 'indexActorAcl'));
+ $this->redirect(array($this->resource, 'module' => 'aclGroup',
'action' => 'indexActorAcl'));
}
}
}
Modified:
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editDefaultAclAction.class.php
==============================================================================
---
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editDefaultAclAction.class.php
Mon Nov 1 15:00:53 2010 (r8752)
+++
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editDefaultAclAction.class.php
Mon Nov 1 15:07:44 2010 (r8753)
@@ -67,7 +67,7 @@
continue;
}
- $this->group->aclPermissions[] = $aclPermission;
+ $this->resource->aclPermissions[] = $aclPermission;
}
}
@@ -82,12 +82,12 @@
{
$aclPermission->grantDeny = (QubitAcl::GRANT == $value) ? 1 : 0;
- $this->group->aclPermissions[] = $aclPermission;
+ $this->resource->aclPermissions[] = $aclPermission;
}
}
}
- $this->group->save();
+ $this->resource->save();
}
public function execute($request)
@@ -97,9 +97,9 @@
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();
}
Modified:
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editInformationObjectAclAction.class.php
==============================================================================
---
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editInformationObjectAclAction.class.php
Mon Nov 1 15:00:53 2010 (r8752)
+++
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editInformationObjectAclAction.class.php
Mon Nov 1 15:07:44 2010 (r8753)
@@ -33,12 +33,12 @@
$this->informationObjects = array();
$this->root = array();
- if (null != $this->group->id)
+ if (null != $this->resource->id)
{
- // Get info object permissions for this group
+ // Get info object permissions for this resource
$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,
'QubitInformationObject');
$c1->addOr($c2);
@@ -78,7 +78,7 @@
if ($this->form->isValid())
{
$this->processForm();
- $this->redirect(array($this->group, 'module' => 'aclGroup', 'action'
=> 'indexInformationObjectAcl'));
+ $this->redirect(array($this->resource, 'module' => 'aclGroup',
'action' => 'indexInformationObjectAcl'));
}
}
}
Modified:
trunk/plugins/qbAclPlugin/modules/aclGroup/templates/editActorAclSuccess.php
==============================================================================
---
trunk/plugins/qbAclPlugin/modules/aclGroup/templates/editActorAclSuccess.php
Mon Nov 1 15:00:53 2010 (r8752)
+++
trunk/plugins/qbAclPlugin/modules/aclGroup/templates/editActorAclSuccess.php
Mon Nov 1 15:07:44 2010 (r8753)
@@ -2,11 +2,11 @@
<h1><?php echo __('Edit %1% permissions', array('%1%' =>
sfConfig::get('app_ui_label_actor'))) ?></h1>
-<h1 class="label"><?php echo $group ?></h1>
+<h1 class="label"><?php echo $resource ?></h1>
<?php echo get_partial('addActorDialog', array('basicActions' =>
$basicActions)) ?>
-<form method="post" action="<?php echo url_for(array($group, 'module' =>
'aclGroup', 'action' => 'editActorAcl')) ?>" id="editForm">
+<form method="post" action="<?php echo url_for(array($resource, 'module' =>
'aclGroup', 'action' => 'editActorAcl')) ?>" id="editForm">
<?php foreach ($actors as $objectId => $permissions): ?>
<div class="form-item">
@@ -23,7 +23,7 @@
<h2 class="element-invisible"><?php echo __('Actions') ?></h2>
<div class="content">
<ul class="clearfix links">
- <li><?php echo link_to(__('Cancel'), array($group, 'module' =>
'aclGroup', 'action' => 'indexActorAcl')) ?></li>
+ <li><?php echo link_to(__('Cancel'), array($resource, 'module' =>
'aclGroup', 'action' => 'indexActorAcl')) ?></li>
<li><input class="form-submit" type="submit" value="<?php echo
__('Save') ?>"/></li>
</ul>
</div>
Modified:
trunk/plugins/qbAclPlugin/modules/aclGroup/templates/editInformationObjectAclSuccess.php
==============================================================================
---
trunk/plugins/qbAclPlugin/modules/aclGroup/templates/editInformationObjectAclSuccess.php
Mon Nov 1 15:00:53 2010 (r8752)
+++
trunk/plugins/qbAclPlugin/modules/aclGroup/templates/editInformationObjectAclSuccess.php
Mon Nov 1 15:07:44 2010 (r8753)
@@ -2,9 +2,9 @@
<h1><?php echo __('Edit %1% permissions', array('%1%' =>
sfConfig::get('app_ui_label_informationobject'))) ?></h1>
-<h1 class="label"><?php echo $group ?></h1>
+<h1 class="label"><?php echo $resource ?></h1>
-<form method="post" action="<?php echo url_for(array($group, 'module' =>
'aclGroup', 'action' => 'editInformationObjectAcl')) ?>" id="editForm">
+<form method="post" action="<?php echo url_for(array($resource, 'module' =>
'aclGroup', 'action' => 'editInformationObjectAcl')) ?>" id="editForm">
<fieldset class="collapsible" id="allInfoObjectsArea">
<legend><?php echo __('Permissions for all %1%', array('%1%' =>
sfConfig::get('app_ui_label_informationobject'))) ?></legend>
@@ -120,7 +120,7 @@
<h2 class="element-invisible"><?php echo __('Actions') ?></h2>
<div class="content">
<ul class="clearfix links">
- <li><?php echo link_to(__('Cancel'), array($group, 'module' =>
'aclGroup', 'action' => 'indexInformationObjectAcl')) ?></li>
+ <li><?php echo link_to(__('Cancel'), array($resource, 'module' =>
'aclGroup', 'action' => 'indexInformationObjectAcl')) ?></li>
<li><input class="form-submit" type="submit" value="<?php echo
__('Save') ?>"/></li>
</ul>
</div>
--
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.
