Author: sevein
Date: Wed Jun 29 16:58:52 2011
New Revision: 9230
Log:
Remove related deaccession records and send user a warning in the delete
confirmation window
Modified:
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/deleteAction.class.php
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/deleteSuccess.php
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/indexSuccess.php
Modified:
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/deleteAction.class.php
==============================================================================
---
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/deleteAction.class.php
Wed Jun 29 16:48:17 2011 (r9229)
+++
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/deleteAction.class.php
Wed Jun 29 16:58:52 2011 (r9230)
@@ -33,6 +33,11 @@
if ($request->isMethod('delete'))
{
+ foreach ($this->resource->deaccessions as $item)
+ {
+ $item->delete();
+ }
+
$this->resource->delete();
$this->redirect(array('module' => 'accession', 'action' => 'list'));
Modified:
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/deleteSuccess.php
==============================================================================
---
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/deleteSuccess.php
Wed Jun 29 16:48:17 2011 (r9229)
+++
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/deleteSuccess.php
Wed Jun 29 16:58:52 2011 (r9230)
@@ -1,5 +1,14 @@
<h1><?php echo __('Are you sure you want to delete %1%?', array('%1%' =>
render_title($resource))) ?></h1>
+<?php if (0 < count($resource->deaccessions)): ?>
+ <h2><?php echo __('It has %1% deaccessions that will also be deleted:',
array('%1%' => count($resource->deaccessions))) ?></h2>
+ <ul>
+ <?php foreach ($resource->deaccessions as $item): ?>
+ <li><?php echo link_to(render_title($item), array($item, 'module' =>
'deaccession')) ?></li>
+ <?php endforeach; ?>
+ </ul>
+<?php endif; ?>
+
<?php echo $form->renderFormTag(url_for(array($resource, 'module' =>
'accession', 'action' => 'delete')), array('method' => 'delete')) ?>
<div class="actions section">
Modified:
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/indexSuccess.php
==============================================================================
---
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/indexSuccess.php
Wed Jun 29 16:48:17 2011 (r9229)
+++
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/indexSuccess.php
Wed Jun 29 16:58:52 2011 (r9230)
@@ -87,7 +87,7 @@
<?php endif; ?>
<?php if (QubitAcl::check($resource, 'delete')): ?>
- <li><?php echo link_to(__('Delete'), array($resource, 'module' =>
'qtAccessionPlugin', 'action' => 'delete')) ?></li>
+ <li><?php echo link_to(__('Delete'), array($resource, 'module' =>
'accession', 'action' => 'delete')) ?></li>
<?php endif; ?>
<li><?php echo link_to(__('Deaccession'), array('module' =>
'deaccession', 'action' => 'add', 'accessionId' => $resource->id)) ?></li>
--
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.
