Author: jablko
Date: Tue Oct 26 17:12:13 2010
New Revision: 8525
Log:
Add generic fallback for objects without slugs, fixes issue 1840
Modified:
trunk/apps/qubit/config/routing.yml
trunk/apps/qubit/modules/menu/templates/listSuccess.php
Modified: trunk/apps/qubit/config/routing.yml
==============================================================================
--- trunk/apps/qubit/config/routing.yml Tue Oct 26 16:54:37 2010 (r8524)
+++ trunk/apps/qubit/config/routing.yml Tue Oct 26 17:12:13 2010 (r8525)
@@ -9,7 +9,7 @@
action: index
slug: home
-indexDc:
+dc:
url: /:slug;dc
class: QubitResourceRoute
param:
@@ -17,21 +17,21 @@
action: index
informationobject_template: dc
-addDc:
+add/dc:
url: /;add/dc
param:
module: sfDcPlugin
action: edit
informationobject_template: dc
-copyDc:
+copy/dc:
url: /;copy/dc
param:
module: sfDcPlugin
action: edit
informationobject_template: dc
-editDc:
+edit/dc:
url: /:slug;edit/dc
class: QubitResourceRoute
param:
@@ -39,7 +39,7 @@
action: edit
informationobject_template: dc
-indexEac:
+eac:
url: /:slug;eac
class: QubitResourceRoute
param:
@@ -47,7 +47,7 @@
action: index
actor_template: eac
-indexEad:
+ead:
url: /:slug;ead
class: QubitResourceRoute
param:
@@ -55,7 +55,7 @@
action: index
informationobject_template: ead
-indexIsaar:
+isaar:
url: /:slug;isaar
class: QubitResourceRoute
param:
@@ -63,14 +63,14 @@
action: index
actor_template: isaar
-addIsaar:
+add/isaar:
url: /;add/isaar
param:
module: sfIsaarPlugin
action: edit
actor_template: isaar
-editIsaar:
+edit/isaar:
url: /:slug;edit/isaar
class: QubitResourceRoute
param:
@@ -78,7 +78,7 @@
action: edit
actor_template: isaar
-indexIsad:
+isad:
url: /:slug;isad
class: QubitResourceRoute
param:
@@ -86,21 +86,21 @@
action: index
informationobject_template: isad
-addIsad:
+add/isad:
url: /;add/isad
param:
module: sfIsadPlugin
action: edit
informationobject_template: isad
-copyIsad:
+copy/isad:
url: /;copy/isad
param:
module: sfIsadPlugin
action: edit
informationobject_template: isad
-editIsad:
+edit/isad:
url: /:slug;edit/isad
class: QubitResourceRoute
param:
@@ -108,27 +108,27 @@
action: edit
informationobject_template: isad
-indexIsdf:
+isdf:
url: /:slug;isdf
class: QubitResourceRoute
param:
module: sfIsdfPlugin
action: index
-addIsdf:
+add/isdf:
url: /;add/isdf
param:
module: sfIsdfPlugin
action: edit
-editIsdf:
+edit/isdf:
url: /:slug;edit/isdf
class: QubitResourceRoute
param:
module: sfIsdfPlugin
action: edit
-indexIsdiah:
+isdiah:
url: /:slug;isdiah
class: QubitResourceRoute
param:
@@ -136,14 +136,14 @@
action: index
repository_template: isdiah
-addIsdiah:
+add/isdiah:
url: /;add/isdiah
param:
module: sfIsdiahPlugin
action: edit
repository_template: isdiah
-editIsdiah:
+edit/isdiah:
url: /:slug;edit/isdiah
class: QubitResourceRoute
param:
@@ -151,7 +151,7 @@
action: edit
repository_template: isdiah
-indexMods:
+mods:
url: /:slug;mods
class: QubitResourceRoute
param:
@@ -159,21 +159,21 @@
action: index
informationobject_template: mods
-addMods:
+add/mods:
url: /;add/mods
param:
module: sfModsPlugin
action: edit
informationobject_template: mods
-copyMods:
+copy/mods:
url: /;copy/mods
param:
module: sfModsPlugin
action: edit
informationobject_template: mods
-editMods:
+edit/mods:
url: /:slug;edit/mods
class: QubitResourceRoute
param:
@@ -181,7 +181,7 @@
action: edit
informationobject_template: mods
-indexRad:
+rad:
url: /:slug;rad
class: QubitResourceRoute
param:
@@ -189,21 +189,21 @@
action: index
informationobject_template: rad
-addRad:
+add/rad:
url: /;add/rad
param:
module: sfRadPlugin
action: edit
informationobject_template: rad
-copyRad:
+copy/rad:
url: /;copy/rad
param:
module: sfRadPlugin
action: edit
informationobject_template: rad
-editRad:
+edit/rad:
url: /:slug;edit/rad
class: QubitResourceRoute
param:
@@ -237,22 +237,8 @@
action: delete
id: { pattern: \d+ }
-menuDelete:
- url: /:id;menu/delete
- param:
- module: menu
- action: delete
- id: { pattern: \d+ }
-
-menuEdit:
- url: /:id;menu/edit
- param:
- module: menu
- action: edit
- id: { pattern: \d+ }
-
# These routes used only to *generate* not *parse* URLs
-actorIndex:
+actor:
url: /:slug;:actor_template
class: QubitResourceRoute
param:
@@ -260,55 +246,54 @@
action: index
actor_template: { pattern: 'eac|isaar' }
-actorCreate:
+actor/add:
url: /;add/:actor_template
param:
module: actor
action: add
-actorEdit:
+actor/edit:
url: /:slug;edit/:actor_template
class: QubitResourceRoute
param:
module: actor
action: edit
-functionIndex:
+function:
url: /:slug;isdf
class: QubitResourceRoute
param:
module: function
action: index
-functionCreate:
+function/add:
url: /;add/isdf
param:
module: function
action: add
-functionEdit:
+function/edit:
url: /:slug;edit/isdf
class: QubitResourceRoute
param:
module: function
action: edit
-repositoryIndex:
- url: /:slug;:repository_template
+repository:
+ url: /:slug;isdiah
class: QubitResourceRoute
param:
module: repository
action: index
- repository_template: { pattern: 'isdiah' }
-repositoryCreate:
- url: /;add/:repository_template
+repository/add:
+ url: /;add/isdiah
param:
module: repository
action: add
-repositoryEdit:
- url: /:slug;edit/:repository_template
+repository/edit:
+ url: /:slug;edit/isdiah
class: QubitResourceRoute
param:
module: repository
@@ -334,7 +319,7 @@
module: oai
action: oai
-informationObjectIndex:
+informationObject:
url: /:slug;:informationobject_template
class: QubitResourceRoute
param:
@@ -354,14 +339,14 @@
module: informationobject
action: copy
-informationObjectEdit:
+informationObject/edit:
url: /:slug;edit/:informationobject_template
class: QubitResourceRoute
param:
module: informationobject
action: edit
-informationObjectList:
+informationObject/list:
url: /;informationobject/list
class: QubitResourceRoute
param:
@@ -392,6 +377,10 @@
url: /:slug;:module/:action
class: QubitResourceRoute
+id;default:
+ url: /;:module/:action/:id
+ class: QubitRoute
+
# After slug;default to avoid matching array($object, 'module' => 'foo',
'action', => 'edit')
edit:
url: /;:module/add
Modified: trunk/apps/qubit/modules/menu/templates/listSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/menu/templates/listSuccess.php Tue Oct 26
16:54:37 2010 (r8524)
+++ trunk/apps/qubit/modules/menu/templates/listSuccess.php Tue Oct 26
17:12:13 2010 (r8525)
@@ -10,32 +10,32 @@
</th>
</tr>
</thead><tbody>
- <?php foreach ($menuTree as $menu): ?>
+ <?php foreach ($menuTree as $item): ?>
<tr class="<?php echo 0 == ++$row % 2 ? 'even' : 'odd' ?>">
- <td<?php if (QUbitMenu::ROOT_ID == $menu['parentId']): ?>
style="font-weight: bold"<?php endif; ?>>
+ <td<?php if (QUbitMenu::ROOT_ID == $item['parentId']): ?>
style="font-weight: bold"<?php endif; ?>>
- <?php echo str_repeat(' ', ($menu['depth'] - 1)) ?>
+ <?php echo str_repeat(' ', ($item['depth'] - 1)) ?>
- <?php if (isset($menu['prev'])): ?>
- <?php echo link_to(image_tag('up.gif', array('alt' => __('Move
up'))), array('module' => 'menu', 'action' => 'list', 'move' => $menu['id'],
'before' => $menu['prev']), array('title' => __('Move item up in list'))) ?>
+ <?php if (isset($item['prev'])): ?>
+ <?php echo link_to(image_tag('up.gif', array('alt' => __('Move
up'))), array('module' => 'menu', 'action' => 'list', 'move' => $item['id'],
'before' => $item['prev']), array('title' => __('Move item up in list'))) ?>
<?php else: ?>
<?php echo image_tag('1x1_transparent', array('height' => '5',
'width' => '13')) ?>
<?php endif; ?>
- <?php if (isset($menu['next'])): ?>
- <?php echo link_to(image_tag('down.gif', array('alt' => __('Move
down'))), array('module' => 'menu', 'action' => 'list', 'move' => $menu['id'],
'after' => $menu['next']), array('title' => __('Move item down in list'))) ?>
+ <?php if (isset($item['next'])): ?>
+ <?php echo link_to(image_tag('down.gif', array('alt' => __('Move
down'))), array('module' => 'menu', 'action' => 'list', 'move' => $item['id'],
'after' => $item['next']), array('title' => __('Move item down in list'))) ?>
<?php else: ?>
<?php echo image_tag('1x1_transparent', array('height' => '5',
'width'=>'13')) ?>
<?php endif; ?>
- <?php if ($menu['protected']): ?>
- <?php echo link_to($menu['name'],
array(QubitMenu::getById($menu['id']), 'module' => 'menu', 'action' => 'edit'),
array('class' => 'readOnly', 'title' => __('Edit menu'))) ?>
+ <?php if ($item['protected']): ?>
+ <?php echo link_to($item['name'],
array(QubitMenu::getById($item['id']), 'module' => 'menu', 'action' => 'edit'),
array('class' => 'readOnly', 'title' => __('Edit menu'))) ?>
<?php else: ?>
- <?php echo link_to($menu['name'],
array(QubitMenu::getById($menu['id']), 'module' => 'menu', 'action' => 'edit'),
array('title' => __('Edit menu'))) ?>
+ <?php echo link_to($item['name'],
array(QubitMenu::getById($item['id']), 'module' => 'menu', 'action' => 'edit'),
array('title' => __('Edit menu'))) ?>
<?php endif; ?>
</td><td>
- <?php echo $menu['label'] ?>
+ <?php echo $item['label'] ?>
</td>
</tr>
<?php endforeach; ?>
--
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.
