Author: sevein
Date: Wed Jun 29 18:03:14 2011
New Revision: 9237
Log:
Catch accession id from informationobject edit action, use accession instead of
accessionId whe used as URL parameter for consistence with source parameter!
Modified:
trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/editDeaccessionAction.class.php
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/indexSuccess.php
Modified:
trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
Wed Jun 29 17:52:39 2011 (r9236)
+++ trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
Wed Jun 29 18:03:14 2011 (r9237)
@@ -100,6 +100,11 @@
$this->form->setValidator('parent', new sfValidatorString);
$this->form->setWidget('parent', new sfWidgetFormInputHidden);
+ // Add id of the accession record
+ $this->form->setDefault('accessionId', $this->request->accession);
+ $this->form->setValidator('accessionId', new sfValidatorInteger);
+ $this->form->setWidget('accessionId', new sfWidgetFormInputHidden);
+
$getParams = $this->request->getGetParameters();
if (isset($getParams['parent']))
{
Modified:
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/editDeaccessionAction.class.php
==============================================================================
---
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/editDeaccessionAction.class.php
Wed Jun 29 17:52:39 2011 (r9236)
+++
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/editDeaccessionAction.class.php
Wed Jun 29 18:03:14 2011 (r9237)
@@ -53,9 +53,9 @@
}
}
- $this->accession = QubitAccession::getById($this->request->accessionId);
+ $this->accession = QubitAccession::getById($this->request->accession);
- $this->form->setDefault('accessionId', $this->request->accessionId);
+ $this->form->setDefault('accessionId', $this->request->accession);
$this->form->setValidator('accessionId', new sfValidatorInteger);
$this->form->setWidget('accessionId', new sfWidgetFormInputHidden);
Modified:
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/indexSuccess.php
==============================================================================
---
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/indexSuccess.php
Wed Jun 29 17:52:39 2011 (r9236)
+++
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/indexSuccess.php
Wed Jun 29 18:03:14 2011 (r9237)
@@ -90,9 +90,9 @@
<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>
+ <li><?php echo link_to(__('Deaccession'), array('module' =>
'deaccession', 'action' => 'add', 'accession' => $resource->id)) ?></li>
- <li><?php echo link_to(__('Create %1%', array('%1%' =>
sfConfig::get('app_ui_label_informationobject'))), array('module' =>
'informationobject', 'action' => 'add', 'accessionId' => $resource->id)) ?></li>
+ <li><?php echo link_to(__('Create %1%', array('%1%' =>
sfConfig::get('app_ui_label_informationobject'))), array('module' =>
'informationobject', 'action' => 'add', 'accession' => $resource->id)) ?></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.
