Author: sevein
Date: Wed Jun 29 17:37:58 2011
New Revision: 9234
Log:
Fix more routing issues in the accession module
Modified:
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/deleteDeaccessionAction.class.php
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/deleteDeaccessionSuccess.php
Modified:
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/deleteDeaccessionAction.class.php
==============================================================================
---
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/deleteDeaccessionAction.class.php
Wed Jun 29 17:28:49 2011 (r9233)
+++
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/deleteDeaccessionAction.class.php
Wed Jun 29 17:37:58 2011 (r9234)
@@ -33,9 +33,11 @@
if ($request->isMethod('delete'))
{
+ $accession = $this->resource->accession;
+
$this->resource->delete();
- $this->redirect(array('module' => 'accession', 'action' => 'list'));
+ $this->redirect(array($accession, 'module' => 'accession'));
}
}
}
Modified:
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/deleteDeaccessionSuccess.php
==============================================================================
---
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/deleteDeaccessionSuccess.php
Wed Jun 29 17:28:49 2011 (r9233)
+++
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/deleteDeaccessionSuccess.php
Wed Jun 29 17:37:58 2011 (r9234)
@@ -1,6 +1,6 @@
<h1><?php echo __('Are you sure you want to delete %1%?', array('%1%' =>
render_title($resource))) ?></h1>
-<?php echo $form->renderFormTag(url_for(array($resource, 'module' =>
'accession', 'action' => 'delete')), array('method' => 'delete')) ?>
+<?php echo $form->renderFormTag(url_for(array($resource, 'module' =>
'deaccession', 'action' => 'delete')), array('method' => 'delete')) ?>
<div class="actions section">
@@ -8,7 +8,7 @@
<div class="content">
<ul class="clearfix links">
- <li><?php echo link_to(__('Cancel'), array($resource, 'module' =>
'accession')) ?></li>
+ <li><?php echo link_to(__('Cancel'), array($resource, 'module' =>
'deaccession')) ?></li>
<li><input class="form-submit" type="submit" value="<?php echo
__('Confirm') ?>"/></li>
</ul>
</div>
--
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.