Author: jablko
Date: Wed Sep 16 09:01:39 2009
New Revision: 3335
Log:
Avoid overwriting default routing parameters, fixes issue 931 -- force
Modified:
trunk/apps/qubit/config/qubitConfiguration.class.php
trunk/apps/qubit/lib/SiteSettingsFilter.class.php
Modified: trunk/apps/qubit/config/qubitConfiguration.class.php
==============================================================================
--- trunk/apps/qubit/config/qubitConfiguration.class.php Wed Sep 16
07:35:21 2009 (r3334)
+++ trunk/apps/qubit/config/qubitConfiguration.class.php Wed Sep 16
09:01:39 2009 (r3335)
@@ -49,6 +49,16 @@
{
$context->routing->setDefaultParameter($name,
$context->request[$name]);
}
+ else
+ {
+ $criteria = new Criteria;
+ $criteria->add(QubitSetting::NAME, substr($name, 0, -9));
+ $criteria->add(QubitSetting::SCOPE, 'default_template');
+ if (1 == count($query = QubitSetting::get($criteria)))
+ {
+ $context->routing->setDefaultParameter($name,
$query[0]->__get('value', array('sourceCulture' => true)));
+ }
+ }
}
$context->routing->insertRouteBefore('default',
'informationObject/create', new
sfRoute('/informationobject/create/:informationobject_template', array('module'
=> 'informationobject', 'action' => 'create', 'parent' => array('default' =>
$context->routing->generate(null, array('module' => 'informationobject',
'action' => 'show', 'id' => QubitInformationObject::ROOT_ID))))));
Modified: trunk/apps/qubit/lib/SiteSettingsFilter.class.php
==============================================================================
--- trunk/apps/qubit/lib/SiteSettingsFilter.class.php Wed Sep 16 07:35:21
2009 (r3334)
+++ trunk/apps/qubit/lib/SiteSettingsFilter.class.php Wed Sep 16 09:01:39
2009 (r3335)
@@ -43,10 +43,6 @@
// overwrite/populate settings into sfConfig object
sfConfig::add($settings);
- // 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'
=> sfConfig::get('app_default_template_informationobject'), 'actor_template'
=> sfConfig::get('app_default_template_actor'), 'repository_template' =>
sfConfig::get('app_default_template_repository')));
-
// execute next filter
$filterChain->execute();
}
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
