Author: david
Date: Fri Oct 2 15:24:09 2009
New Revision: 3651
Log:
Eliminte notices on information object isad edit template.
Modified:
trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
Modified:
trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
Fri Oct 2 15:23:37 2009 (r3650)
+++ trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
Fri Oct 2 15:24:09 2009 (r3651)
@@ -33,7 +33,10 @@
switch ($name)
{
case 'descriptionDetail':
- $this->form->setDefault('descriptionDetail',
$this->context->routing->generate(null, array('module' => 'term', 'action' =>
'show', 'id' => $this->informationObject->descriptionDetail->id)));
+ if (null !== $this->informationObject->descriptionDetail)
+ {
+ $this->form->setDefault('descriptionDetail',
$this->context->routing->generate(null, array('module' => 'term', 'action' =>
'show', 'id' => $this->informationObject->descriptionDetail->id)));
+ }
$this->form->setValidator('descriptionDetail', new sfValidatorString);
$choices = array();
@@ -48,7 +51,10 @@
break;
case 'descriptionStatus':
- $this->form->setDefault('descriptionStatus',
$this->context->routing->generate(null, array('module' => 'term', 'action' =>
'show', 'id' => $this->informationObject->descriptionStatus->id)));
+ if (null !== $this->informationObject->descriptionStatus)
+ {
+ $this->form->setDefault('descriptionStatus',
$this->context->routing->generate(null, array('module' => 'term', 'action' =>
'show', 'id' => $this->informationObject->descriptionStatus->id)));
+ }
$this->form->setValidator('descriptionStatus', new sfValidatorString);
$choices = array();
@@ -71,7 +77,10 @@
break;
case 'levelOfDescription':
- $this->form->setDefault('levelOfDescription',
$this->context->routing->generate(null, array('module' => 'term', 'action' =>
'show', 'id' => $this->informationObject->levelOfDescription->id)));
+ if (null !== $this->informationObject->levelOfDescription)
+ {
+ $this->form->setDefault('levelOfDescription',
$this->context->routing->generate(null, array('module' => 'term', 'action' =>
'show', 'id' => $this->informationObject->levelOfDescription->id)));
+ }
$this->form->setValidator('levelOfDescription', new sfValidatorString);
$choices = array();
@@ -86,7 +95,10 @@
break;
case 'publicationStatus':
- $this->form->setDefault('publicationStatus',
$this->informationObject->getStatus($options = array('typeId' =>
QubitTerm::STATUS_TYPE_PUBLICATION_ID))->statusId);
+ if (null !== ($publicationStatus =
$this->informationObject->getStatus($options = array('typeId' =>
QubitTerm::STATUS_TYPE_PUBLICATION_ID))))
+ {
+ $this->form->setDefault('publicationStatus',
$publicationStatus->statusId);
+ }
$this->form->setValidator('publicationStatus', new sfValidatorString);
if (QubitAcl::check($this->informationObject,
QubitAclAction::PUBLISH_ID))
@@ -115,9 +127,14 @@
break;
case 'repository':
- $this->form->setDefault('repository',
$this->context->routing->generate(null, array('module' => 'repository',
'action' => 'show', 'id' => $this->informationObject->repository->id)));
+ $choices = array();
+ if (null !== ($repository = $this->informationObject->repository))
+ {
+ $this->form->setDefault('repository',
$this->context->routing->generate(null, array('module' => 'repository',
'action' => 'show', 'id' => $repository->id)));
+ $choices = array($this->context->routing->generate(null,
array('module' => 'repository', 'action' => 'show', 'id' => $repository->id))
=> $repository);
+ }
$this->form->setValidator('repository', new sfValidatorString);
- $this->form->setWidget('repository', new
sfWidgetFormSelect(array('choices' =>
array($this->context->routing->generate(null, array('module' => 'repository',
'action' => 'show', 'id' => $this->informationObject->repository->id)) =>
$this->informationObject->repository))));
+ $this->form->setWidget('repository', new
sfWidgetFormSelect(array('choices' => $choices)));
if (isset($this->request->id))
{
--~--~---------~--~----~------------~-------~--~----~
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.ca/group/qubit-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
