Author: jablko
Date: Mon Sep 14 15:59:53 2009
New Revision: 3282
Log:
Move default parameters from actions to routing
Modified:
trunk/apps/qubit/config/qubitConfiguration.class.php
trunk/apps/qubit/config/routing.yml
trunk/apps/qubit/modules/informationobject/actions/editDcAction.class.php
trunk/apps/qubit/modules/informationobject/actions/editIsadAction.class.php
trunk/apps/qubit/modules/informationobject/actions/editModsAction.class.php
trunk/apps/qubit/modules/informationobject/actions/editRadAction.class.php
trunk/apps/qubit/modules/informationobject/actions/showDcAction.class.php
trunk/apps/qubit/modules/informationobject/actions/showIsadAction.class.php
trunk/apps/qubit/modules/informationobject/actions/showModsAction.class.php
trunk/apps/qubit/modules/informationobject/actions/showRadAction.class.php
Modified: trunk/apps/qubit/config/qubitConfiguration.class.php
==============================================================================
--- trunk/apps/qubit/config/qubitConfiguration.class.php Mon Sep 14
15:57:11 2009 (r3281)
+++ trunk/apps/qubit/config/qubitConfiguration.class.php Mon Sep 14
15:59:53 2009 (r3282)
@@ -42,6 +42,14 @@
{
$context->getResponse()->addMeta('description',
$query[0]->__get('value', array('cultureFallback' => true)));
}
+
+ foreach (array('actor_template', 'informationobject_template',
'repository_template') as $name)
+ {
+ if (isset($context->request[$name]))
+ {
+ $context->routing->setDefaultParameter($name,
$context->request[$name]);
+ }
+ }
}
public function responseFilterContent(sfEvent $event, $content)
Modified: trunk/apps/qubit/config/routing.yml
==============================================================================
--- trunk/apps/qubit/config/routing.yml Mon Sep 14 15:57:11 2009 (r3281)
+++ trunk/apps/qubit/config/routing.yml Mon Sep 14 15:59:53 2009 (r3282)
@@ -12,75 +12,75 @@
createDc:
url: /:module/create/dc
- param: { action: editDc }
+ param: { action: editDc, informationobject_template: dc }
editDc:
url: /:module/edit/dc/:id
- param: { action: editDc }
+ param: { action: editDc, informationobject_template: dc }
showDc:
url: /:module/show/dc/:id
- param: { action: showDc }
+ param: { action: showDc, informationobject_template: dc }
createIsaar:
url: /:module/create/isaar
- param: { action: editIsaar }
+ param: { action: editIsaar, actor_template: isaar }
editIsaar:
url: /:module/edit/isaar/:id
- param: { action: editIsaar }
+ param: { action: editIsaar, actor_template: isaar }
showIsaar:
url: /:module/show/isaar/:id
- param: { action: showIsaar }
+ param: { action: showIsaar, actor_template: isaar }
createIsad:
url: /:module/create/isad
- param: { action: editIsad }
+ param: { action: editIsad, informationobject_template: isad }
editIsad:
url: /:module/edit/isad/:id
- param: { action: editIsad }
+ param: { action: editIsad, informationobject_template: isad }
showIsad:
url: /:module/show/isad/:id
- param: { action: showIsad }
+ param: { action: showIsad, informationobject_template: isad }
createIsdiah:
url: /:module/create/isdiah
- param: { action: editIsdiah }
+ param: { action: editIsdiah, repository_template: isdiah }
editIsdiah:
url: /:module/edit/isdiah/:id
- param: { action: editIsdiah }
+ param: { action: editIsdiah, repository_template: isdiah }
showIsdiah:
url: /:module/show/isdiah/:id
- param: { action: showIsdiah }
+ param: { action: showIsdiah, repository_template: isdiah }
createMods:
url: /:module/create/mods
- param: { action: editMods }
+ param: { action: editMods, informationobject_template: mods }
editMods:
url: /:module/edit/mods/:id
- param: { action: editMods }
+ param: { action: editMods, informationobject_template: mods }
showMods:
url: /:module/show/mods/:id
- param: { action: showMods }
+ param: { action: showMods, informationobject_template: mods }
createRad:
url: /:module/create/rad
- param: { action: editRad }
+ param: { action: editRad, informationobject_template: rad }
editRad:
url: /:module/edit/rad/:id
- param: { action: editRad }
+ param: { action: editRad, informationobject_template: rad }
showRad:
url: /:module/show/rad/:id
- param: { action: showRad }
+ param: { action: showRad, informationobject_template: rad }
exportEad:
url: /:module/export/ead/:id
Modified:
trunk/apps/qubit/modules/informationobject/actions/editDcAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/editDcAction.class.php
Mon Sep 14 15:57:11 2009 (r3281)
+++ trunk/apps/qubit/modules/informationobject/actions/editDcAction.class.php
Mon Sep 14 15:59:53 2009 (r3282)
@@ -93,8 +93,6 @@
public function execute($request)
{
-
$this->context->getRouting()->setDefaultParameter('informationobject_template',
'dc');
-
parent::execute($request);
// add Dublin Core specific commands
Modified:
trunk/apps/qubit/modules/informationobject/actions/editIsadAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/editIsadAction.class.php
Mon Sep 14 15:57:11 2009 (r3281)
+++ trunk/apps/qubit/modules/informationobject/actions/editIsadAction.class.php
Mon Sep 14 15:59:53 2009 (r3282)
@@ -98,8 +98,6 @@
public function execute($request)
{
-
$this->context->getRouting()->setDefaultParameter('informationobject_template',
'isad');
-
parent::execute($request);
// Get ISAD specific event types
Modified:
trunk/apps/qubit/modules/informationobject/actions/editModsAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/editModsAction.class.php
Mon Sep 14 15:57:11 2009 (r3281)
+++ trunk/apps/qubit/modules/informationobject/actions/editModsAction.class.php
Mon Sep 14 15:59:53 2009 (r3282)
@@ -70,13 +70,6 @@
}
}
- public function execute($request)
- {
-
$this->context->getRouting()->setDefaultParameter('informationobject_template',
'mods');
-
- parent::execute($request);
- }
-
protected function processField($field)
{
switch ($field->getName())
Modified:
trunk/apps/qubit/modules/informationobject/actions/editRadAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/editRadAction.class.php
Mon Sep 14 15:57:11 2009 (r3281)
+++ trunk/apps/qubit/modules/informationobject/actions/editRadAction.class.php
Mon Sep 14 15:59:53 2009 (r3282)
@@ -151,8 +151,6 @@
public function execute($request)
{
-
$this->context->getRouting()->setDefaultParameter('informationobject_template',
'rad');
-
parent::execute($request);
// add RAD specific commands
Modified:
trunk/apps/qubit/modules/informationobject/actions/showDcAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/showDcAction.class.php
Mon Sep 14 15:57:11 2009 (r3281)
+++ trunk/apps/qubit/modules/informationobject/actions/showDcAction.class.php
Mon Sep 14 15:59:53 2009 (r3282)
@@ -28,11 +28,4 @@
class InformationObjectShowDcAction extends InformationObjectShowAction
{
- public function execute($request)
- {
-
$this->context->getRouting()->setDefaultParameter('informationobject_template',
'dc');
-
- // run the core informationObject show action commands
- parent::execute($request);
- }
}
Modified:
trunk/apps/qubit/modules/informationobject/actions/showIsadAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/showIsadAction.class.php
Mon Sep 14 15:57:11 2009 (r3281)
+++ trunk/apps/qubit/modules/informationobject/actions/showIsadAction.class.php
Mon Sep 14 15:59:53 2009 (r3282)
@@ -30,9 +30,6 @@
{
public function execute($request)
{
-
$this->context->getRouting()->setDefaultParameter('informationobject_template',
'isad');
-
- // run the core informationObject show action commands
parent::execute($request);
// Split notes into "Notes" (general notes), Title notes and Publication
notes
Modified:
trunk/apps/qubit/modules/informationobject/actions/showModsAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/showModsAction.class.php
Mon Sep 14 15:57:11 2009 (r3281)
+++ trunk/apps/qubit/modules/informationobject/actions/showModsAction.class.php
Mon Sep 14 15:59:53 2009 (r3282)
@@ -28,11 +28,4 @@
class InformationObjectShowModsAction extends InformationObjectShowAction
{
- public function execute($request)
- {
-
$this->context->getRouting()->setDefaultParameter('informationobject_template',
'mods');
-
- // run the core informationObject show action commands
- parent::execute($request);
- }
}
Modified:
trunk/apps/qubit/modules/informationobject/actions/showRadAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/showRadAction.class.php
Mon Sep 14 15:57:11 2009 (r3281)
+++ trunk/apps/qubit/modules/informationobject/actions/showRadAction.class.php
Mon Sep 14 15:59:53 2009 (r3282)
@@ -30,9 +30,6 @@
{
public function execute($request)
{
-
$this->context->getRouting()->setDefaultParameter('informationobject_template',
'rad');
-
- // run the core informationObject show action commands
parent::execute($request);
// add RAD specific commands
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
