Author: sevein
Date: Thu Aug 9 15:47:07 2012
New Revision: 12066
Log:
Cleanups
Modified:
trunk/apps/qubit/modules/informationobject/actions/treeViewComponent.class.php
trunk/apps/qubit/modules/informationobject/templates/_treeView.php
Modified:
trunk/apps/qubit/modules/informationobject/actions/treeViewComponent.class.php
==============================================================================
---
trunk/apps/qubit/modules/informationobject/actions/treeViewComponent.class.php
Thu Aug 9 15:46:31 2012 (r12065)
+++
trunk/apps/qubit/modules/informationobject/actions/treeViewComponent.class.php
Thu Aug 9 15:47:07 2012 (r12066)
@@ -22,10 +22,9 @@
public function execute($request)
{
$this->resource = $request->getAttribute('sf_route')->resource;
- $this->parent = $this->resource->parent;
// We don't want to support sorting when sorting by other than lft
- $this->sortable ='none' ==
sfConfig::get('app_sort_treeview_informationobject') &&
QubitAcl::check($this->resource, 'update');
+ $this->sortable = 'none' ==
sfConfig::get('app_sort_treeview_informationobject') &&
QubitAcl::check($this->resource, 'update');
// At this point we don't need to do any ACL check on ancestors
$this->ancestors = $this->resource->getAncestors()->orderBy('lft');
Modified: trunk/apps/qubit/modules/informationobject/templates/_treeView.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/templates/_treeView.php Thu Aug
9 15:46:31 2012 (r12065)
+++ trunk/apps/qubit/modules/informationobject/templates/_treeView.php Thu Aug
9 15:47:07 2012 (r12066)
@@ -13,7 +13,7 @@
<?php echo render_treeview_node(
$item,
array('ancestor' => true),
- array('xhr-location' => url_for(array('module' => 'informationobject',
'action' => 'treeView', 'slug' => $item->slug)))); ?>
+ array('xhr-location' => url_for(array($item, 'module' =>
'informationobject', 'action' => 'treeView')))); ?>
<?php endforeach; ?>
<?php // More button ?>
@@ -21,7 +21,7 @@
<?php echo render_treeview_node(
null,
array('more' => true),
- array('xhr-location' => url_for(array('module' => 'informationobject',
'action' => 'treeView', 'slug' => $prevSiblings[0]->slug)))); ?>
+ array('xhr-location' => url_for(array($prevSiblings[0], 'module' =>
'informationobject', 'action' => 'treeView')))); ?>
<?php endif; ?>
<?php // N prev items ?>
@@ -29,7 +29,7 @@
<?php echo render_treeview_node(
$prev,
array('expand' => 1 < $prev->rgt - $prev->lft),
- array('xhr-location' => url_for(array('module' => 'informationobject',
'action' => 'treeView', 'slug' => $prev->slug)))); ?>
+ array('xhr-location' => url_for(array($prev, 'module' =>
'informationobject', 'action' => 'treeView')))); ?>
<?php endforeach; ?>
<?php // Current ?>
@@ -43,7 +43,7 @@
<?php echo render_treeview_node(
$next,
array('expand' => 1 < $next->rgt - $next->lft),
- array('xhr-location' => url_for(array('module' => 'informationobject',
'action' => 'treeView', 'slug' => $next->slug)))); ?>
+ array('xhr-location' => url_for(array($next->slug, 'module' =>
'informationobject', 'action' => 'treeView')))); ?>
<?php endforeach; ?>
<?php // More button ?>
@@ -52,7 +52,7 @@
<?php echo render_treeview_node(
null,
array('more' => true),
- array('xhr-location' => url_for(array('module' => 'informationobject',
'action' => 'treeView', 'slug' => $last->slug)))); ?>
+ array('xhr-location' => url_for(array($last, 'module' =>
'informationobject', 'action' => 'treeView')))); ?>
<?php endif; ?>
</ul>
--
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.
