Author: sevein
Date: Thu Nov 4 16:33:34 2010
New Revision: 8780
Log:
Use $resource. Fixes issue 1885.
Modified:
trunk/apps/qubit/modules/digitalobject/actions/imageflowComponent.class.php
trunk/apps/qubit/modules/digitalobject/templates/_imageflow.php
Modified:
trunk/apps/qubit/modules/digitalobject/actions/imageflowComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/digitalobject/actions/imageflowComponent.class.php
Thu Nov 4 16:18:07 2010 (r8779)
+++ trunk/apps/qubit/modules/digitalobject/actions/imageflowComponent.class.php
Thu Nov 4 16:33:34 2010 (r8780)
@@ -61,12 +61,12 @@
// Get total number of descendant digital objects
$this->total = 0;
- if (isset($this->informationObject->id))
+ if (isset($this->resource))
{
$criteria = new Criteria;
$criteria->addJoin(QubitInformationObject::ID,
QubitDigitalObject::INFORMATION_OBJECT_ID);
- $criteria->add(QubitInformationObject::LFT,
$this->informationObject->lft, Criteria::GREATER_THAN);
- $criteria->add(QubitInformationObject::RGT,
$this->informationObject->rgt, Criteria::LESS_THAN);
+ $criteria->add(QubitInformationObject::LFT, $this->resource->lft,
Criteria::GREATER_THAN);
+ $criteria->add(QubitInformationObject::RGT, $this->resource->rgt,
Criteria::LESS_THAN);
$this->total = BasePeer::doCount($criteria)->fetchColumn(0);
}
Modified: trunk/apps/qubit/modules/digitalobject/templates/_imageflow.php
==============================================================================
--- trunk/apps/qubit/modules/digitalobject/templates/_imageflow.php Thu Nov
4 16:18:07 2010 (r8779)
+++ trunk/apps/qubit/modules/digitalobject/templates/_imageflow.php Thu Nov
4 16:33:34 2010 (r8780)
@@ -12,7 +12,7 @@
<div class="result-count">
<?php echo __('Results %1% to %2% of %3%', array('%1%' => 1, '%2%' =>
$limit, '%3%' => $total)) ?>
</div><div>
- <a href="<?php echo url_for(array($informationObject, 'module' =>
'informationobject', 'showFullImageflow' => 'true')) ?>"><?php echo __('See
all') ?></a>
+ <a href="<?php echo url_for(array($resource, 'module' =>
'informationobject', 'showFullImageflow' => 'true')) ?>"><?php echo __('See
all') ?></a>
</div>
<?php endif ?>
</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.
