Author: sevein
Date: Wed Jun 29 17:28:49 2011
New Revision: 9233
Log:
Fix delete link issues
Deleted:
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/deleteDeaccession.class.php
Modified:
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/editDeaccessionAction.class.php
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/indexDeaccessionAction.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
Wed Jun 29 17:28:18 2011 (r9232)
+++
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/editDeaccessionAction.class.php
Wed Jun 29 17:28:49 2011 (r9233)
@@ -53,6 +53,8 @@
}
}
+ $this->accession = QubitAccession::getById($this->request->accessionId);
+
$this->form->setDefault('accessionId', $this->request->accessionId);
$this->form->setValidator('accessionId', new sfValidatorInteger);
$this->form->setWidget('accessionId', new sfWidgetFormInputHidden);
Modified:
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/indexDeaccessionAction.class.php
==============================================================================
---
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/indexDeaccessionAction.class.php
Wed Jun 29 17:28:18 2011 (r9232)
+++
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/indexDeaccessionAction.class.php
Wed Jun 29 17:28:49 2011 (r9233)
@@ -41,6 +41,21 @@
$validatorSchema = new sfValidatorSchema;
$values = array();
+ $validatorSchema->identifier = new sfValidatorString(array(
+ 'required' => true), array(
+ 'required' => $this->context->i18n->__('Identifier - This is a
mandatory element.')));
+ $values['identifier'] = $this->resource->identifier;
+
+ $validatorSchema->scope = new sfValidatorString(array(
+ 'required' => true), array(
+ 'required' => $this->context->i18n->__('Scope - This is a mandatory
element.')));
+ $values['identifier'] = $this->resource->scope;
+
+ $validatorSchema->description = new sfValidatorString(array(
+ 'required' => true), array(
+ 'required' => $this->context->i18n->__('Description - This is a
mandatory element.')));
+ $values['identifier'] = $this->resource->description;
+
try
{
$validatorSchema->clean($values);
Modified:
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/editDeaccessionSuccess.php
==============================================================================
---
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/editDeaccessionSuccess.php
Wed Jun 29 17:28:18 2011 (r9232)
+++
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/editDeaccessionSuccess.php
Wed Jun 29 17:28:49 2011 (r9233)
@@ -12,15 +12,20 @@
<?php echo $form->renderHiddenFields() ?>
- <?php echo $form->identifier->renderRow() ?>
+ <?php echo $form->identifier
+ ->label(__('Identifier').' <span class="form-required" title="'.__('This
is a mandatory element.').'">*</span>')
+ ->renderRow() ?>
- <?php echo $form->scope->renderRow() ?>
+ <?php echo $form->scope
+ ->label(__('Scope').' <span class="form-required" title="'.__('This is a
mandatory element.').'">*</span>')
+ ->renderRow() ?>
- <?php echo render_field($form->description, $resource) ?>
+ <?php echo render_field($form->description
+ ->label(__('Description').' <span class="form-required" title="'.__('This
is a mandatory element.').'">*</span>'), $resource, array('class' =>
'resizable')) ?>
- <?php echo render_field($form->extent, $resource) ?>
+ <?php echo render_field($form->extent, $resource, array('class' =>
'resizable')) ?>
- <?php echo render_field($form->reason, $resource) ?>
+ <?php echo render_field($form->reason, $resource, array('class' =>
'resizable')) ?>
<div class="actions section">
@@ -33,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('module' => 'accession',
'action' => 'index')) ?></li>
+ <li><?php echo link_to(__('Cancel'), array($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.
