Author: david
Date: Wed Oct 13 17:27:15 2010
New Revision: 8087
Log:
Rollback revision 7609.
Modified:
trunk/apps/qubit/modules/repository/actions/editAction.class.php
trunk/plugins/sfIsdiahPlugin/modules/sfIsdiahPlugin/actions/editAction.class.php
trunk/plugins/sfIsdiahPlugin/modules/sfIsdiahPlugin/templates/editSuccess.php
Modified: trunk/apps/qubit/modules/repository/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/repository/actions/editAction.class.php Wed Oct
13 16:24:32 2010 (r8086)
+++ trunk/apps/qubit/modules/repository/actions/editAction.class.php Wed Oct
13 17:27:15 2010 (r8087)
@@ -91,25 +91,6 @@
break;
- case 'relatedInfoObjects':
- $values = array();
- $choices = array();
-
- if (0 < count($this->resource->informationObjects))
- {
- foreach ($this->resource->informationObjects as $informationObject)
- {
- $values[] = $this->context->routing->generate(null,
array($informationObject, 'module' => 'informationObject'));
- $choices[$this->context->routing->generate(null,
array($informationObject, 'module' => 'informationObject'))] =
$informationObject;
- }
- }
-
- $this->form->setDefault('relatedInfoObjects', $values);
- $this->form->setValidator('relatedInfoObjects', new sfValidatorPass);
- $this->form->setWidget('relatedInfoObjects', new
sfWidgetFormSelect(array('choices' => $choices, 'multiple' => true)));
-
- break;
-
case 'descStatus':
case 'descDetail':
@@ -237,36 +218,6 @@
}
break;
-
- case 'relatedInfoObjects':
- $filtered = $flipped = array();
- foreach ($this->form->getValue('relatedInfoObjects') as $value)
- {
- $params = $this->context->routing->parse(Qubit::pathInfo($value));
- $filtered[$params['id']] = $flipped[$params['id']] = $params['id'];
- }
-
- foreach ($this->informationObjects as $informationObject)
- {
- if (isset($flipped[$informationObject->id]))
- {
- unset($filtered[$informationObject->id]);
- }
- else
- {
- $informationObject->repositoryId = null;
- }
- }
-
- foreach ($filtered as $id)
- {
- $informationObject = QubitInformationObject::getById($id);
-
- $this->resource->informationObjects[] = $informationObject;
- }
-
- break;
-
case 'descStatus':
case 'descDetail':
$params =
$this->context->routing->parse(Qubit::pathInfo($this->form->getValue($name)));
Modified:
trunk/plugins/sfIsdiahPlugin/modules/sfIsdiahPlugin/actions/editAction.class.php
==============================================================================
---
trunk/plugins/sfIsdiahPlugin/modules/sfIsdiahPlugin/actions/editAction.class.php
Wed Oct 13 16:24:32 2010 (r8086)
+++
trunk/plugins/sfIsdiahPlugin/modules/sfIsdiahPlugin/actions/editAction.class.php
Wed Oct 13 17:27:15 2010 (r8087)
@@ -50,7 +50,6 @@
'researchServices',
'reproductionServices',
'publicFacilities',
- 'relatedInfoObjects',
'descIdentifier',
'descInstitutionIdentifier',
'descRules',
Modified:
trunk/plugins/sfIsdiahPlugin/modules/sfIsdiahPlugin/templates/editSuccess.php
==============================================================================
---
trunk/plugins/sfIsdiahPlugin/modules/sfIsdiahPlugin/templates/editSuccess.php
Wed Oct 13 16:24:32 2010 (r8086)
+++
trunk/plugins/sfIsdiahPlugin/modules/sfIsdiahPlugin/templates/editSuccess.php
Wed Oct 13 17:27:15 2010 (r8087)
@@ -236,27 +236,6 @@
</fieldset>
<!-- ******************************************* -->
- <!-- Relationships area -->
- <!-- ******************************************* -->
- <fieldset class="collapsible collapsed" id="relationshipsArea">
-
- <legend><?php echo __('Relationships area') ?></legend>
-
- <div class="form-item">
- <?php echo $form->relatedInfoObjects
- ->label(__('Related archival materials'))
- ->renderLabel() ?>
- <?php echo $form->relatedInfoObjects->render(array('class' =>
'form-autocomplete')) ?>
- <?php echo $form->relatedInfoObjects
- ->help(__('Select the title from the drop-down menu; enter the
identifier or the first few letters to narrow the choices. (ISDIAH 6.1)'))
- ->renderHelp() ?>
- <input class="add" type="hidden" value="<?php echo
url_for(array('module' => 'informationobject', 'action' => 'create')) ?>
#title"/>
- <input class="list" type="hidden" value="<?php echo
url_for(array('module' => 'informationobject', 'action' => 'autocomplete'))
?>"/>
- </div>
-
- </fieldset>
-
- <!-- ******************************************* -->
<!-- Control area -->
<!-- ******************************************* -->
<fieldset class="collapsible collapsed" id="descriptionControlArea">
--
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.
