Author: peter
Date: 2008-11-06 16:56:41 -0800 (Thu, 06 Nov 2008)
New Revision: 1531
Modified:
trunk/qubit/apps/qubit/config/routing.yml
trunk/qubit/apps/qubit/lib/SiteSettingsFilter.class.php
trunk/qubit/apps/qubit/modules/actor/actions/createAction.class.php
trunk/qubit/apps/qubit/modules/actor/actions/createIsaarAction.class.php
trunk/qubit/apps/qubit/modules/actor/actions/editAction.class.php
trunk/qubit/apps/qubit/modules/actor/actions/editIsaarAction.class.php
trunk/qubit/apps/qubit/modules/actor/actions/listAction.class.php
trunk/qubit/apps/qubit/modules/actor/actions/showAction.class.php
trunk/qubit/apps/qubit/modules/actor/actions/showIsaarAction.class.php
trunk/qubit/apps/qubit/modules/informationobject/actions/createAction.class.php
trunk/qubit/apps/qubit/modules/informationobject/actions/createDcAction.class.php
trunk/qubit/apps/qubit/modules/informationobject/actions/createIsadAction.class.php
trunk/qubit/apps/qubit/modules/informationobject/actions/createModsAction.class.php
trunk/qubit/apps/qubit/modules/informationobject/actions/createRadAction.class.php
trunk/qubit/apps/qubit/modules/informationobject/actions/editAction.class.php
trunk/qubit/apps/qubit/modules/informationobject/actions/editDcAction.class.php
trunk/qubit/apps/qubit/modules/informationobject/actions/editIsadAction.class.php
trunk/qubit/apps/qubit/modules/informationobject/actions/editModsAction.class.php
trunk/qubit/apps/qubit/modules/informationobject/actions/editRadAction.class.php
trunk/qubit/apps/qubit/modules/informationobject/actions/listAction.class.php
trunk/qubit/apps/qubit/modules/informationobject/actions/showAction.class.php
trunk/qubit/apps/qubit/modules/informationobject/actions/showDcAction.class.php
trunk/qubit/apps/qubit/modules/informationobject/actions/showIsadAction.class.php
trunk/qubit/apps/qubit/modules/informationobject/actions/showModsAction.class.php
trunk/qubit/apps/qubit/modules/informationobject/actions/showRadAction.class.php
trunk/qubit/apps/qubit/modules/repository/actions/createAction.class.php
trunk/qubit/apps/qubit/modules/repository/actions/createIsdiahAction.class.php
trunk/qubit/apps/qubit/modules/repository/actions/editAction.class.php
trunk/qubit/apps/qubit/modules/repository/actions/editIsdiahAction.class.php
trunk/qubit/apps/qubit/modules/repository/actions/listAction.class.php
trunk/qubit/apps/qubit/modules/repository/actions/showAction.class.php
trunk/qubit/apps/qubit/modules/repository/actions/showIsdiahAction.class.php
Log:
clean up action/template routing to use routing.yml rules in conjuction with a
default template set per module in the SiteSettingsFilter. Gets rid of the
hard-coded setTemplate() calls in the create, edit, list, show actions. TODO:
cleanup the use of default_template constants in the update and delete actions,
incl. the 'returnTemplate' technique currently used for delete links in the
templates. Use the site settings default_template constant to set a default
standard per module, not per template and apply the constant to the
SiteSettingsFilter to make it user-configurable for an admin.
Modified: trunk/qubit/apps/qubit/config/routing.yml
===================================================================
--- trunk/qubit/apps/qubit/config/routing.yml 2008-11-07 00:02:28 UTC (rev
1530)
+++ trunk/qubit/apps/qubit/config/routing.yml 2008-11-07 00:56:41 UTC (rev
1531)
@@ -1,3 +1,7 @@
+createDc:
+ url: /:module/create/dc/*
+ param: { action: createDc }
+
editDc:
url: /:module/edit/dc/*
param: { action: editDc }
@@ -2,19 +6,69 @@
+showDc:
+ url: /:module/show/dc/*
+ param: { action: showDc }
+
+createIsad:
+ url: /:module/create/isad/*
+ param: { action: createIsad }
+
editIsad:
url: /:module/edit/isad/*
param: { action: editIsad }
+showIsad:
+ url: /:module/show/isad/*
+ param: { action: showIsad }
+
+createRad:
+ url: /:module/create/rad/*
+ param: { action: createRad }
+
editRad:
url: /:module/edit/rad/*
param: { action: editRad }
-showIsad:
- url: /:module/show/isad/*
- param: { action: showIsad }
+showRad:
+ url: /:module/show/rad/*
+ param: { action: showRad }
-template:
- url: /informationobject/:action/:template/*
+createIsaar:
+ url: /:module/create/isaar/*
+ param: { action: createIsaar }
+
+editIsaar:
+ url: /:module/edit/isaar/*
+ param: { action: editIsaar }
+
+showIsaar:
+ url: /:module/show/isaar/*
+ param: { action: showIsaar }
+
+createIsdiah:
+ url: /:module/create/isdiah/*
+ param: { action: createIsdiah }
+
+editIsaar:
+ url: /:module/edit/isdiah/*
+ param: { action: editIsdiah }
+
+showIsdiah:
+ url: /:module/show/isdiah/*
+ param: { action: showIsdiah }
+
+informationobject_template:
+ url: /informationobject/:action/:informationobject_template/*
param: { module: informationobject }
- requirements: { action: edit|show }
+ requirements: { action: create|edit|show }
+actor_template:
+ url: /actor/:action/:actor_template/*
+ param: { module: actor }
+ requirements: { action: create|edit|show }
+
+repository_template:
+ url: /repository/:action/:repository_template/*
+ param: { module: repository }
+ requirements: { action: create|edit|show }
+
homepage:
Modified: trunk/qubit/apps/qubit/lib/SiteSettingsFilter.class.php
===================================================================
--- trunk/qubit/apps/qubit/lib/SiteSettingsFilter.class.php 2008-11-07
00:02:28 UTC (rev 1530)
+++ trunk/qubit/apps/qubit/lib/SiteSettingsFilter.class.php 2008-11-07
00:56:41 UTC (rev 1531)
@@ -47,9 +47,9 @@
$this->setSiteTitle();
- // Set routing default parameters so that links to edit and show actions
- // get routed to existent actions
- $this->context->getRouting()->setDefaultParameters(array('template' =>
'isad'));
+ // Set routing default parameters so that links to create, edit and show
actions
+ // get routed to default actions
+
$this->context->getRouting()->setDefaultParameters(array('informationobject_template'
=> 'isad', 'actor_template' => 'isaar', 'repository_template' => 'isdiah'));
// execute next filter
$filterChain->execute();
Modified: trunk/qubit/apps/qubit/modules/actor/actions/createAction.class.php
===================================================================
--- trunk/qubit/apps/qubit/modules/actor/actions/createAction.class.php
2008-11-07 00:02:28 UTC (rev 1530)
+++ trunk/qubit/apps/qubit/modules/actor/actions/createAction.class.php
2008-11-07 00:56:41 UTC (rev 1531)
@@ -21,7 +21,7 @@
/**
* Controller for Actor creation.
- *
+ *
* @package qubit
* @subpackage actor
* @version svn: $Id$
@@ -57,8 +57,5 @@
$this->getResponse()->addJavaScript('jquery');
$this->getResponse()->addJavaScript('/vendor/drupal/misc/drupal');
$this->getResponse()->addJavaScript('multiInstanceSelect');
-
- // Set default template
- $this->setTemplate(sfConfig::get('app_default_template_actor_edit'));
}
}
Modified:
trunk/qubit/apps/qubit/modules/actor/actions/createIsaarAction.class.php
===================================================================
--- trunk/qubit/apps/qubit/modules/actor/actions/createIsaarAction.class.php
2008-11-07 00:02:28 UTC (rev 1530)
+++ trunk/qubit/apps/qubit/modules/actor/actions/createIsaarAction.class.php
2008-11-07 00:56:41 UTC (rev 1531)
@@ -37,7 +37,7 @@
// add ISAAR specific commands
- // overwrite the default edit template
+ // route to the edit template
$this->setTemplate('editIsaar');
}
}
Modified: trunk/qubit/apps/qubit/modules/actor/actions/editAction.class.php
===================================================================
--- trunk/qubit/apps/qubit/modules/actor/actions/editAction.class.php
2008-11-07 00:02:28 UTC (rev 1530)
+++ trunk/qubit/apps/qubit/modules/actor/actions/editAction.class.php
2008-11-07 00:56:41 UTC (rev 1531)
@@ -21,7 +21,7 @@
/**
* Controller for editing actor information.
- *
+ *
* @package qubit
* @subpackage actor
* @version svn: $Id$
@@ -80,8 +80,5 @@
$this->getResponse()->addJavaScript('jquery');
$this->getResponse()->addJavaScript('/vendor/drupal/misc/drupal');
$this->getResponse()->addJavaScript('multiInstanceSelect');
-
- // Set default template
- $this->setTemplate(sfConfig::get('app_default_template_actor_edit'));
}
}
Modified: trunk/qubit/apps/qubit/modules/actor/actions/editIsaarAction.class.php
===================================================================
--- trunk/qubit/apps/qubit/modules/actor/actions/editIsaarAction.class.php
2008-11-07 00:02:28 UTC (rev 1530)
+++ trunk/qubit/apps/qubit/modules/actor/actions/editIsaarAction.class.php
2008-11-07 00:56:41 UTC (rev 1531)
@@ -36,8 +36,5 @@
parent::execute($request);
// add ISAAR specific commands
-
- // overwrite the default edit template
- $this->setTemplate('editIsaar');
}
}
Modified: trunk/qubit/apps/qubit/modules/actor/actions/listAction.class.php
===================================================================
--- trunk/qubit/apps/qubit/modules/actor/actions/listAction.class.php
2008-11-07 00:02:28 UTC (rev 1530)
+++ trunk/qubit/apps/qubit/modules/actor/actions/listAction.class.php
2008-11-07 00:56:41 UTC (rev 1531)
@@ -33,23 +33,23 @@
public function execute($request)
{
$options = array();
-
+
// Set culture and cultural fallback flag
$this->culture = $this->getUser()->getCulture();
$options['cultureFallback'] = true; // Do cultural fallback
-
+
// Set sort
$this->sort = $this->getRequestParameter('sort', 'nameUp');
$options['sort'] = $this->sort;
-
+
// Set current page
$this->page = $this->getRequestParameter('page', 1);
$options['page'] = $this->page;
-
+
// Set role
$this->role = $this->getRequestParameter('role', 'all');
$options['role'] = $this->role;
-
+
// Get results
$this->actors = QubitActor::getList($this->culture, $options);
@@ -59,8 +59,5 @@
{
$this->editCredentials = true;
}
-
- // Set default template
- $this->setTemplate(sfConfig::get('app_default_template_actor_list'));
}
}
Modified: trunk/qubit/apps/qubit/modules/actor/actions/showAction.class.php
===================================================================
--- trunk/qubit/apps/qubit/modules/actor/actions/showAction.class.php
2008-11-07 00:02:28 UTC (rev 1530)
+++ trunk/qubit/apps/qubit/modules/actor/actions/showAction.class.php
2008-11-07 00:56:41 UTC (rev 1531)
@@ -43,15 +43,12 @@
$this->datesOfChanges = $this->actor->getDatesOfChanges();
$this->relatedActors = $this->actor->getRelatedActors();
-
+
//determine if user has edit priviliges
$this->editCredentials = false;
if (SecurityPriviliges::editCredentials($this->getUser(), 'actor'))
{
$this->editCredentials = true;
}
-
- // Set default template
- $this->setTemplate(sfConfig::get('app_default_template_actor_show'));
}
}
Modified: trunk/qubit/apps/qubit/modules/actor/actions/showIsaarAction.class.php
===================================================================
--- trunk/qubit/apps/qubit/modules/actor/actions/showIsaarAction.class.php
2008-11-07 00:02:28 UTC (rev 1530)
+++ trunk/qubit/apps/qubit/modules/actor/actions/showIsaarAction.class.php
2008-11-07 00:56:41 UTC (rev 1531)
@@ -36,8 +36,5 @@
parent::execute($request);
// add ISAAR specific commands
-
- // overwrite the default edit template
- $this->setTemplate('showIsaar');
}
}
Modified:
trunk/qubit/apps/qubit/modules/informationobject/actions/createAction.class.php
===================================================================
---
trunk/qubit/apps/qubit/modules/informationobject/actions/createAction.class.php
2008-11-07 00:02:28 UTC (rev 1530)
+++
trunk/qubit/apps/qubit/modules/informationobject/actions/createAction.class.php
2008-11-07 00:56:41 UTC (rev 1531)
@@ -69,8 +69,5 @@
// Physical Object
$this->physicalObject = null;
-
- // Set default template
-
$this->setTemplate(sfConfig::get('app_default_template_informationobject_edit'));
}
}
Modified:
trunk/qubit/apps/qubit/modules/informationobject/actions/createDcAction.class.php
===================================================================
---
trunk/qubit/apps/qubit/modules/informationobject/actions/createDcAction.class.php
2008-11-07 00:02:28 UTC (rev 1530)
+++
trunk/qubit/apps/qubit/modules/informationobject/actions/createDcAction.class.php
2008-11-07 00:56:41 UTC (rev 1531)
@@ -20,7 +20,7 @@
*/
/**
- * Information Object - createDc
+ * Information Object - createDc
*
* @package qubit
* @subpackage informationObject - initialize an editDC template for the
creation of a new information object
@@ -36,8 +36,5 @@
parent::execute($request);
// add Dublin Core specific commands
-
- // overwrite the default create template
- $this->setTemplate('editDc');
}
}
Modified:
trunk/qubit/apps/qubit/modules/informationobject/actions/createIsadAction.class.php
===================================================================
---
trunk/qubit/apps/qubit/modules/informationobject/actions/createIsadAction.class.php
2008-11-07 00:02:28 UTC (rev 1530)
+++
trunk/qubit/apps/qubit/modules/informationobject/actions/createIsadAction.class.php
2008-11-07 00:56:41 UTC (rev 1531)
@@ -20,7 +20,7 @@
*/
/**
- * Information Object - createIsad
+ * Information Object - createIsad
*
* @package qubit
* @subpackage informationObject - initialize an editIsad template for the
creation of a new information object
@@ -37,7 +37,7 @@
// add ISAD specific commands
- // overwrite the default create template
+ // route to the edit template
$this->setTemplate('editIsad');
}
}
\ No newline at end of file
Modified:
trunk/qubit/apps/qubit/modules/informationobject/actions/createModsAction.class.php
===================================================================
---
trunk/qubit/apps/qubit/modules/informationobject/actions/createModsAction.class.php
2008-11-07 00:02:28 UTC (rev 1530)
+++
trunk/qubit/apps/qubit/modules/informationobject/actions/createModsAction.class.php
2008-11-07 00:56:41 UTC (rev 1531)
@@ -37,7 +37,7 @@
// add MODS specific commands
- // overwrite the default create template
+ // route to the edit template
$this->setTemplate('editMods');
}
}
Modified:
trunk/qubit/apps/qubit/modules/informationobject/actions/createRadAction.class.php
===================================================================
---
trunk/qubit/apps/qubit/modules/informationobject/actions/createRadAction.class.php
2008-11-07 00:02:28 UTC (rev 1530)
+++
trunk/qubit/apps/qubit/modules/informationobject/actions/createRadAction.class.php
2008-11-07 00:56:41 UTC (rev 1531)
@@ -20,7 +20,7 @@
*/
/**
- * Information Object - createRad
+ * Information Object - createRad
*
* @package qubit
* @subpackage informationObject - initialize an editRad template for the
creation of a new information object
@@ -41,7 +41,7 @@
$this->radTitleNoteTypes =
QubitTerm::getOptionsForSelectList(QubitTaxonomy::RAD_TITLE_NOTE_ID);
$this->radNoteTypes =
QubitTerm::getOptionsForSelectList(QubitTaxonomy::RAD_NOTE_ID);
- // overwrite the default create template
+ // route to the edit template
$this->setTemplate('editRad');
}
}
Modified:
trunk/qubit/apps/qubit/modules/informationobject/actions/editAction.class.php
===================================================================
---
trunk/qubit/apps/qubit/modules/informationobject/actions/editAction.class.php
2008-11-07 00:02:28 UTC (rev 1530)
+++
trunk/qubit/apps/qubit/modules/informationobject/actions/editAction.class.php
2008-11-07 00:56:41 UTC (rev 1531)
@@ -21,7 +21,7 @@
/**
* Get current state data for information object edit form.
- *
+ *
* @package qubit
* @subpackage informationobject
* @version svn: $Id$
@@ -86,8 +86,5 @@
{
$this->digitalObjectCount = 1;
}
-
- // Set default template
-
$this->setTemplate(sfConfig::get('app_default_template_informationobject_edit'));
}
}
Modified:
trunk/qubit/apps/qubit/modules/informationobject/actions/editDcAction.class.php
===================================================================
---
trunk/qubit/apps/qubit/modules/informationobject/actions/editDcAction.class.php
2008-11-07 00:02:28 UTC (rev 1530)
+++
trunk/qubit/apps/qubit/modules/informationobject/actions/editDcAction.class.php
2008-11-07 00:56:41 UTC (rev 1531)
@@ -20,7 +20,7 @@
*/
/**
- * Information Object - editDc
+ * Information Object - editDc
*
* @package qubit
* @subpackage informationObject - initialize an editDc template for updating
an information object
@@ -36,8 +36,5 @@
parent::execute($request);
// add Dublin Core specific commands
-
- // overwrite the default edit template
- $this->setTemplate('editDc');
}
}
Modified:
trunk/qubit/apps/qubit/modules/informationobject/actions/editIsadAction.class.php
===================================================================
---
trunk/qubit/apps/qubit/modules/informationobject/actions/editIsadAction.class.php
2008-11-07 00:02:28 UTC (rev 1530)
+++
trunk/qubit/apps/qubit/modules/informationobject/actions/editIsadAction.class.php
2008-11-07 00:56:41 UTC (rev 1531)
@@ -36,8 +36,5 @@
parent::execute($request);
// add ISAD specific commands
-
- // overwrite the default edit template
- $this->setTemplate('editIsad');
}
}
Modified:
trunk/qubit/apps/qubit/modules/informationobject/actions/editModsAction.class.php
===================================================================
---
trunk/qubit/apps/qubit/modules/informationobject/actions/editModsAction.class.php
2008-11-07 00:02:28 UTC (rev 1530)
+++
trunk/qubit/apps/qubit/modules/informationobject/actions/editModsAction.class.php
2008-11-07 00:56:41 UTC (rev 1531)
@@ -36,8 +36,5 @@
parent::execute($request);
// add MODS specific commands
-
- // overwrite the default edit template
- $this->setTemplate('editMods');
}
}
Modified:
trunk/qubit/apps/qubit/modules/informationobject/actions/editRadAction.class.php
===================================================================
---
trunk/qubit/apps/qubit/modules/informationobject/actions/editRadAction.class.php
2008-11-07 00:02:28 UTC (rev 1530)
+++
trunk/qubit/apps/qubit/modules/informationobject/actions/editRadAction.class.php
2008-11-07 00:56:41 UTC (rev 1531)
@@ -40,8 +40,5 @@
$this->radTitleNotes =
$this->informationObject->getNotesByTaxonomy($options = array('taxonomyId' =>
QubitTaxonomy::RAD_TITLE_NOTE_ID));
$this->radTitleNoteTypes =
QubitTerm::getOptionsForSelectList(QubitTaxonomy::RAD_TITLE_NOTE_ID);
$this->radNoteTypes =
QubitTerm::getOptionsForSelectList(QubitTaxonomy::RAD_NOTE_ID);
-
- // overwrite the default edit template
- $this->setTemplate('editRad');
}
}
Modified:
trunk/qubit/apps/qubit/modules/informationobject/actions/listAction.class.php
===================================================================
---
trunk/qubit/apps/qubit/modules/informationobject/actions/listAction.class.php
2008-11-07 00:02:28 UTC (rev 1530)
+++
trunk/qubit/apps/qubit/modules/informationobject/actions/listAction.class.php
2008-11-07 00:56:41 UTC (rev 1531)
@@ -27,7 +27,7 @@
*/
class InformationObjectListAction extends sfAction
{
-
+
/**
* Display a paginated hitlist of information objects (top-level only)
*
@@ -37,56 +37,53 @@
{
$options = array();
$this->repositoryId = 0;
-
+
// HACK: Get root information object for _contextMenu partial
$criteria = new Criteria;
$criteria->add(QubitInformationObject::PARENT_ID);
$root = QubitInformationObject::getOne($criteria);
$request->setAttribute('informationObject', $root);
-
+
// Set parent id to the root node id
$options['parentId'] = $root->getId();
-
+
// Set culture and cultural fallback flag
$this->culture = $this->getUser()->getCulture();
$options['cultureFallback'] = true; // Do cultural fallback
-
+
// Set sort
$this->sort = $this->getRequestParameter('sort', 'titleUp');
$options['sort'] = $this->sort;
-
+
// Set current page
$this->page = $this->getRequestParameter('page', 1);
$options['page'] = $this->page;
-
+
// Filter by repository
if ($this->getRequestParameter('repository'))
{
$this->repositoryId = $this->getRequestParameter('repository');
$options['repositoryId'] = $this->repositoryId;
}
-
+
// Filter by collection type
if ($this->getRequestParameter('collectionType'))
{
$this->collectionType = $this->getRequestParameter('collectionType');
$options['collectionType'] = $this->collectionType;
}
-
+
// Get QubitQuery collection of information objects (with pagination,
fallback and sorting)
$this->informationObjects =
QubitInformationObject::getList($this->culture, $options);
-
+
//determine if user has edit priviliges
$this->editCredentials = false;
if (SecurityPriviliges::editCredentials($this->getUser(),
'informationObject'))
{
$this->editCredentials = true;
}
-
+
// determine if system is set to "multi-repository"
$this->multiRepository = (sfConfig::get('app_multi_repository') !== '0');
-
- // Set default template
-
$this->setTemplate(sfConfig::get('app_default_template_informationobject_list'));
}
}
Modified:
trunk/qubit/apps/qubit/modules/informationobject/actions/showAction.class.php
===================================================================
---
trunk/qubit/apps/qubit/modules/informationobject/actions/showAction.class.php
2008-11-07 00:02:28 UTC (rev 1530)
+++
trunk/qubit/apps/qubit/modules/informationobject/actions/showAction.class.php
2008-11-07 00:56:41 UTC (rev 1531)
@@ -51,9 +51,9 @@
$this->nameAccessPoints[] = $event;
}
}
-
+
$this->materialTypes = $this->informationObject->getMaterialTypes();
-
+
$this->physicalObjects =
QubitRelation::getRelatedSubjectsByObjectId($this->informationObject->getId(),
array('typeId'=>QubitTerm::HAS_PHYSICAL_OBJECT_ID));
@@ -63,8 +63,5 @@
{
$this->editCredentials = true;
}
-
- // Set default template
-
$this->setTemplate(sfConfig::get('app_default_template_informationobject_show'));
}
}
Modified:
trunk/qubit/apps/qubit/modules/informationobject/actions/showDcAction.class.php
===================================================================
---
trunk/qubit/apps/qubit/modules/informationobject/actions/showDcAction.class.php
2008-11-07 00:02:28 UTC (rev 1530)
+++
trunk/qubit/apps/qubit/modules/informationobject/actions/showDcAction.class.php
2008-11-07 00:56:41 UTC (rev 1531)
@@ -36,8 +36,5 @@
parent::execute($request);
// add DC specific commands
-
- // overwrite the default show template
- $this->setTemplate('showDc');
}
}
Modified:
trunk/qubit/apps/qubit/modules/informationobject/actions/showIsadAction.class.php
===================================================================
---
trunk/qubit/apps/qubit/modules/informationobject/actions/showIsadAction.class.php
2008-11-07 00:02:28 UTC (rev 1530)
+++
trunk/qubit/apps/qubit/modules/informationobject/actions/showIsadAction.class.php
2008-11-07 00:56:41 UTC (rev 1531)
@@ -36,8 +36,5 @@
parent::execute($request);
// add ISAD specific commands
-
- // overwrite the default show template
- $this->setTemplate('showIsad');
}
}
Modified:
trunk/qubit/apps/qubit/modules/informationobject/actions/showModsAction.class.php
===================================================================
---
trunk/qubit/apps/qubit/modules/informationobject/actions/showModsAction.class.php
2008-11-07 00:02:28 UTC (rev 1530)
+++
trunk/qubit/apps/qubit/modules/informationobject/actions/showModsAction.class.php
2008-11-07 00:56:41 UTC (rev 1531)
@@ -36,8 +36,5 @@
parent::execute($request);
// add MODS specific commands
-
- // overwrite the default show template
- $this->setTemplate('showMods');
}
}
Modified:
trunk/qubit/apps/qubit/modules/informationobject/actions/showRadAction.class.php
===================================================================
---
trunk/qubit/apps/qubit/modules/informationobject/actions/showRadAction.class.php
2008-11-07 00:02:28 UTC (rev 1530)
+++
trunk/qubit/apps/qubit/modules/informationobject/actions/showRadAction.class.php
2008-11-07 00:56:41 UTC (rev 1531)
@@ -38,8 +38,5 @@
// add RAD specific commands
$this->radNotes = $this->informationObject->getNotesByTaxonomy($options =
array('noteTypeId' => 'QubitTaxonomy::RAD_NOTE_ID'));
$this->radTitleNotes =
$this->informationObject->getNotesByTaxonomy($options = array('noteTypeId' =>
'QubitTaxonomy::RAD_TITLE_NOTE_ID'));
-
- // overwrite the default show template
- $this->setTemplate('showRad');
}
}
Modified:
trunk/qubit/apps/qubit/modules/repository/actions/createAction.class.php
===================================================================
--- trunk/qubit/apps/qubit/modules/repository/actions/createAction.class.php
2008-11-07 00:02:28 UTC (rev 1530)
+++ trunk/qubit/apps/qubit/modules/repository/actions/createAction.class.php
2008-11-07 00:56:41 UTC (rev 1531)
@@ -21,7 +21,7 @@
/**
* Controller for creating a repository.
- *
+ *
* @package qubit
* @subpackage repository
* @version svn: $Id$
@@ -59,8 +59,5 @@
$this->getResponse()->addJavaScript('jquery');
$this->getResponse()->addJavaScript('/vendor/drupal/misc/drupal');
$this->getResponse()->addJavaScript('multiInstanceSelect');
-
- // Set default template
- $this->setTemplate(sfConfig::get('app_default_template_repository_edit'));
}
}
Modified:
trunk/qubit/apps/qubit/modules/repository/actions/createIsdiahAction.class.php
===================================================================
---
trunk/qubit/apps/qubit/modules/repository/actions/createIsdiahAction.class.php
2008-11-07 00:02:28 UTC (rev 1530)
+++
trunk/qubit/apps/qubit/modules/repository/actions/createIsdiahAction.class.php
2008-11-07 00:56:41 UTC (rev 1531)
@@ -37,7 +37,7 @@
// add ISDIAH specific commands
- // overwrite the default edit template
+ // route to edit template
$this->setTemplate('editIsdiah');
}
}
Modified: trunk/qubit/apps/qubit/modules/repository/actions/editAction.class.php
===================================================================
--- trunk/qubit/apps/qubit/modules/repository/actions/editAction.class.php
2008-11-07 00:02:28 UTC (rev 1530)
+++ trunk/qubit/apps/qubit/modules/repository/actions/editAction.class.php
2008-11-07 00:56:41 UTC (rev 1531)
@@ -21,7 +21,7 @@
/**
* Controller for editing repository information.
- *
+ *
* @package qubit
* @subpackage repository
* @version svn: $Id$
@@ -61,8 +61,5 @@
$this->getResponse()->addJavaScript('jquery');
$this->getResponse()->addJavaScript('/vendor/drupal/misc/drupal');
$this->getResponse()->addJavaScript('multiInstanceSelect');
-
- // Set default template
- $this->setTemplate(sfConfig::get('app_default_template_repository_edit'));
}
}
Modified:
trunk/qubit/apps/qubit/modules/repository/actions/editIsdiahAction.class.php
===================================================================
---
trunk/qubit/apps/qubit/modules/repository/actions/editIsdiahAction.class.php
2008-11-07 00:02:28 UTC (rev 1530)
+++
trunk/qubit/apps/qubit/modules/repository/actions/editIsdiahAction.class.php
2008-11-07 00:56:41 UTC (rev 1531)
@@ -20,7 +20,7 @@
*/
/**
- * Repository - editIsdiah
+ * Repository - editIsdiah
*
* @package qubit
* @subpackage Actor - initialize an editIDIAH template for updating a
repository
@@ -36,8 +36,5 @@
parent::execute($request);
// add ISDIAH specific commands
-
- // overwrite the default edit template
- $this->setTemplate('editIsdiah');
}
}
Modified: trunk/qubit/apps/qubit/modules/repository/actions/listAction.class.php
===================================================================
--- trunk/qubit/apps/qubit/modules/repository/actions/listAction.class.php
2008-11-07 00:02:28 UTC (rev 1530)
+++ trunk/qubit/apps/qubit/modules/repository/actions/listAction.class.php
2008-11-07 00:56:41 UTC (rev 1531)
@@ -27,7 +27,7 @@
*/
class RepositoryListAction extends sfAction
{
-
+
/**
* Show hitlist of repositories
*
@@ -37,37 +37,34 @@
{
$options = array();
$this->country = 0;
-
+
// Set culture and cultural fallback flag
$this->culture = $this->getUser()->getCulture();
$options['cultureFallback'] = true; // Do cultural fallback
-
+
// Set sort
$this->sort = $this->getRequestParameter('sort', 'nameUp');
$options['sort'] = $this->sort;
-
+
// Set current page
$this->page = $this->getRequestParameter('page', 1);
$options['page'] = $this->page;
-
+
// Filter by country
if ($this->getRequestParameter('country'))
{
$this->country = strtoupper($this->getRequestParameter('country'));
$options['countryCode'] = $this->country;
}
-
+
// Get repository hitlist
$this->repositories = QubitRepository::getList($this->culture, $options);
-
+
//determine if user has edit priviliges
$this->editCredentials = false;
if (SecurityPriviliges::editCredentials($this->getUser(), 'repository'))
{
$this->editCredentials = true;
}
-
- // Set default template
- $this->setTemplate(sfConfig::get('app_default_template_repository_list'));
}
}
Modified: trunk/qubit/apps/qubit/modules/repository/actions/showAction.class.php
===================================================================
--- trunk/qubit/apps/qubit/modules/repository/actions/showAction.class.php
2008-11-07 00:02:28 UTC (rev 1530)
+++ trunk/qubit/apps/qubit/modules/repository/actions/showAction.class.php
2008-11-07 00:56:41 UTC (rev 1531)
@@ -42,8 +42,5 @@
{
$this->editCredentials = true;
}
-
- // Set default template
- $this->setTemplate(sfConfig::get('app_default_template_repository_show'));
}
}
Modified:
trunk/qubit/apps/qubit/modules/repository/actions/showIsdiahAction.class.php
===================================================================
---
trunk/qubit/apps/qubit/modules/repository/actions/showIsdiahAction.class.php
2008-11-07 00:02:28 UTC (rev 1530)
+++
trunk/qubit/apps/qubit/modules/repository/actions/showIsdiahAction.class.php
2008-11-07 00:56:41 UTC (rev 1531)
@@ -20,7 +20,7 @@
*/
/**
- * Repository - showIsdiah
+ * Repository - showIsdiah
*
* @package qubit
* @subpackage Actor - initialize a showIDIAH template for displaying a
repository
@@ -36,8 +36,5 @@
parent::execute($request);
// add ISDIAH specific commands
-
- // overwrite the default show template
- $this->setTemplate('showIsdiah');
}
}
--~--~---------~--~----~------------~-------~--~----~
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.ca/group/qubit-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
