Author: jablko
Date: Mon Oct 25 14:06:15 2010
New Revision: 8483
Log:
No need to check authorization twice
Modified:
trunk/apps/qubit/modules/informationobject/actions/deleteAction.class.php
Modified:
trunk/apps/qubit/modules/informationobject/actions/deleteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/deleteAction.class.php
Mon Oct 25 14:02:15 2010 (r8482)
+++ trunk/apps/qubit/modules/informationobject/actions/deleteAction.class.php
Mon Oct 25 14:06:15 2010 (r8483)
@@ -41,18 +41,15 @@
{
$parent = $this->resource->parent;
- if (QubitAcl::check($this->resource, 'delete'))
+ foreach ($this->resource->descendants->andSelf()->orderBy('rgt') as
$item)
{
- foreach ($this->resource->descendants->andSelf()->orderBy('rgt') as
$item)
+ // Delete related digitalObjects
+ foreach ($item->digitalObjects as $digitalObject)
{
- // Delete related digitalObjects
- foreach ($item->digitalObjects as $digitalObject)
- {
- $digitalObject->delete();
- }
-
- $item->delete();
+ $digitalObject->delete();
}
+
+ $item->delete();
}
if (isset($parent->parent))
--
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.