Author: sevein
Date: Thu Jun 30 10:22:32 2011
New Revision: 9239
Log:
Fix more routing issues when editing deaccession records, cancel button
Modified:
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/editDeaccessionAction.class.php
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/editDeaccessionSuccess.php
Modified:
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/editDeaccessionAction.class.php
==============================================================================
---
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/editDeaccessionAction.class.php
Thu Jun 30 10:22:00 2011 (r9238)
+++
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/editDeaccessionAction.class.php
Thu Jun 30 10:22:32 2011 (r9239)
@@ -46,6 +46,12 @@
}
else
{
+ $this->form->setDefault('accessionId', $this->request->accession);
+ $this->form->setValidator('accessionId', new sfValidatorInteger);
+ $this->form->setWidget('accessionId', new sfWidgetFormInputHidden);
+
+ $this->resource->accessionId = $this->request->accession;
+
// Check user authorization
if (!QubitAcl::check($this->resource, 'create'))
{
@@ -53,12 +59,6 @@
}
}
- $this->accession = QubitAccession::getById($this->request->accession);
-
- $this->form->setDefault('accessionId', $this->request->accession);
- $this->form->setValidator('accessionId', new sfValidatorInteger);
- $this->form->setWidget('accessionId', new sfWidgetFormInputHidden);
-
$title = $this->context->i18n->__('Add new deaccession record');
if (isset($this->getRoute()->resource))
{
@@ -148,7 +148,7 @@
$this->resource->save();
- $this->redirect(array($this->resource->accession, 'module' =>
'qtAccessionPlugin'));
+ $this->redirect(array($this->resource->accession, 'module' =>
'accession'));
}
}
}
Modified:
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/editDeaccessionSuccess.php
==============================================================================
---
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/editDeaccessionSuccess.php
Thu Jun 30 10:22:00 2011 (r9238)
+++
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/editDeaccessionSuccess.php
Thu Jun 30 10:22:32 2011 (r9239)
@@ -38,7 +38,7 @@
<li><?php echo link_to(__('Cancel'), array($resource, 'module' =>
'deaccession')) ?></li>
<li><input class="form-submit" type="submit" value="<?php echo
__('Save') ?>"/></li>
<?php else: ?>
- <li><?php echo link_to(__('Cancel'), array($accession, 'module' =>
'accession')) ?></li>
+ <li><?php echo link_to(__('Cancel'), array($resource->accession,
'module' => 'accession')) ?></li>
<li><input class="form-submit" type="submit" value="<?php echo
__('Create') ?>"/></li>
<?php endif; ?>
--
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.
