Author: david Date: Thu Oct 13 16:42:23 2011 New Revision: 10084 Log: Add item list to information object reports page. Replace file with item in action and template
Modified: trunk/apps/qubit/modules/informationobject/actions/itemListAction.class.php trunk/apps/qubit/modules/informationobject/actions/reportsAction.class.php trunk/apps/qubit/modules/informationobject/templates/itemListCriteria.php trunk/apps/qubit/modules/informationobject/templates/itemListSuccess.php Modified: trunk/apps/qubit/modules/informationobject/actions/itemListAction.class.php ============================================================================== --- trunk/apps/qubit/modules/informationobject/actions/itemListAction.class.php Thu Oct 13 16:30:16 2011 (r10083) +++ trunk/apps/qubit/modules/informationobject/actions/itemListAction.class.php Thu Oct 13 16:42:23 2011 (r10084) @@ -18,7 +18,7 @@ */ /** - * File list report + * Item list report * * @package qubit * @subpackage informationobject @@ -26,7 +26,7 @@ * @author David Juhasz <[email protected]> * @version svn:$Id$ */ -class InformationObjectFileListAction extends sfAction +class InformationObjectItemListAction extends sfAction { // Arrays not allowed in class constants public static @@ -92,10 +92,10 @@ public function generateReport($request) { - // Get "file" term in "level of description" taxonomy + // Get "item" term in "level of description" taxonomy $c2 = new Criteria; $c2->addJoin(QubitTerm::ID, QubitTermI18n::ID, Criteria::INNER_JOIN); - $c2->add(QubitTermI18n::NAME, 'file'); + $c2->add(QubitTermI18n::NAME, 'item'); $c2->add(QubitTermI18n::CULTURE, 'en'); $c2->add(QubitTerm::TAXONOMY_ID, QubitTaxonomy::LEVEL_OF_DESCRIPTION_ID); @@ -103,7 +103,7 @@ if (null === $lod) { - throw new sfException('Can\'t find "file" level of description in term table'); + throw new sfException('Can\'t find "item" level of description in term table'); } $criteria = new Criteria; Modified: trunk/apps/qubit/modules/informationobject/actions/reportsAction.class.php ============================================================================== --- trunk/apps/qubit/modules/informationobject/actions/reportsAction.class.php Thu Oct 13 16:30:16 2011 (r10083) +++ trunk/apps/qubit/modules/informationobject/actions/reportsAction.class.php Thu Oct 13 16:42:23 2011 (r10084) @@ -32,7 +32,7 @@ case 'report': $choices = array( $this->context->routing->generate(null, array($this->resource, 'module' => 'informationobject', 'action' => 'fileList')) => $this->context->i18n->__('File list'), - //$this->context->routing->generate(null, array($this->resource, 'module' => 'informationobject', 'action' => 'itemList')) => $this->context->i18n->__('Item list'), + $this->context->routing->generate(null, array($this->resource, 'module' => 'informationobject', 'action' => 'itemList')) => $this->context->i18n->__('Item list'), ); if ($this->getUser()->isAuthenticated()) Modified: trunk/apps/qubit/modules/informationobject/templates/itemListCriteria.php ============================================================================== --- trunk/apps/qubit/modules/informationobject/templates/itemListCriteria.php Thu Oct 13 16:30:16 2011 (r10083) +++ trunk/apps/qubit/modules/informationobject/templates/itemListCriteria.php Thu Oct 13 16:42:23 2011 (r10084) @@ -1,10 +1,10 @@ -<h1><?php echo __('File list - report criteria') ?></h1> +<h1><?php echo __('Item list - report criteria') ?></h1> <h1 class="label"><?php echo $resource->__toString() ?></h1> <?php echo $form->renderGlobalErrors() ?> -<?php echo $form->renderFormTag(url_for(array($resource, 'module' => 'informationobject', 'action' => 'fileList'))) ?> +<?php echo $form->renderFormTag(url_for(array($resource, 'module' => 'informationobject', 'action' => 'itemList'))) ?> <div class="section"> Modified: trunk/apps/qubit/modules/informationobject/templates/itemListSuccess.php ============================================================================== --- trunk/apps/qubit/modules/informationobject/templates/itemListSuccess.php Thu Oct 13 16:30:16 2011 (r10083) +++ trunk/apps/qubit/modules/informationobject/templates/itemListSuccess.php Thu Oct 13 16:42:23 2011 (r10084) @@ -1,9 +1,9 @@ <div id="preview-message"> <?php echo __('Print preview') ?> - <?php echo link_to('Close', array($resource, 'module' => 'informationobject', 'action' => 'fileList')) ?> + <?php echo link_to('Close', array($resource, 'module' => 'informationobject', 'action' => 'itemList')) ?> </div> -<h1 class="label"><?php echo __('File list') ?></h1> +<h1 class="label"><?php echo __('Item list') ?></h1> <?php $row = $startrow = 1; foreach ($results as $parent => $items): ?> -- 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.
