Author: jablko
Date: Tue Oct 19 17:13:40 2010
New Revision: 8322
Log:
Use base component
Modified:
trunk/apps/qubit/modules/informationobject/actions/eventComponent.class.php
trunk/plugins/sfIsadPlugin/modules/sfIsadPlugin/actions/editAction.class.php
trunk/plugins/sfIsadPlugin/modules/sfIsadPlugin/actions/eventComponent.class.php
Modified:
trunk/apps/qubit/modules/informationobject/actions/eventComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/eventComponent.class.php
Tue Oct 19 17:00:01 2010 (r8321)
+++ trunk/apps/qubit/modules/informationobject/actions/eventComponent.class.php
Tue Oct 19 17:13:40 2010 (r8322)
@@ -114,6 +114,10 @@
}
break;
+
+ default:
+
+ return parent::processField($field);
}
}
}
Modified:
trunk/plugins/sfIsadPlugin/modules/sfIsadPlugin/actions/editAction.class.php
==============================================================================
---
trunk/plugins/sfIsadPlugin/modules/sfIsadPlugin/actions/editAction.class.php
Tue Oct 19 17:00:01 2010 (r8321)
+++
trunk/plugins/sfIsadPlugin/modules/sfIsadPlugin/actions/editAction.class.php
Tue Oct 19 17:13:40 2010 (r8322)
@@ -172,6 +172,8 @@
{
$this->resource->sourceStandard = 'ISAD(G) 2nd edition';
+ $this->eventComponent->processForm();
+
$this->updateNotes();
return parent::processForm();
Modified:
trunk/plugins/sfIsadPlugin/modules/sfIsadPlugin/actions/eventComponent.class.php
==============================================================================
---
trunk/plugins/sfIsadPlugin/modules/sfIsadPlugin/actions/eventComponent.class.php
Tue Oct 19 17:00:01 2010 (r8321)
+++
trunk/plugins/sfIsadPlugin/modules/sfIsadPlugin/actions/eventComponent.class.php
Tue Oct 19 17:13:40 2010 (r8322)
@@ -22,47 +22,8 @@
// Arrays not allowed in class constants
public static
$NAMES = array(
- 'type',
- 'startDate',
+ 'dateDisplay',
'endDate',
- 'dateDisplay');
-
- /**
- * ISAD form only allows entering data for creation dates and creator names,
- * as two separate events.
- *
- * @param QubitInformationObject $informationObject
- */
- protected function updateEvents()
- {
- if (isset($this->request->editEvents))
- {
- foreach ($this->request->editEvents as $updateDate)
- {
- if (isset($updateDate['id']) && !isset($this->request->sourceId))
- {
- $event = QubitEvent::getById($updateDate['id']);
- if (!isset($event))
- {
- continue; // If event id isn't valid, skip this row
- }
- }
- else if (0 < strlen($updateDate['startDate']) || 0 <
strlen($updateDate['dateDisplay']))
- {
- $event = new QubitEvent;
- }
- else
- {
- continue;
- }
-
- $event->typeId = $updateDate['typeId'];
- $event->startDate = $updateDate['startDate'];
- $event->endDate = $updateDate['endDate'];
- $event->dateDisplay = $updateDate['dateDisplay'];
-
- $this->resource->events[] = $event;
- }
- }
- }
+ 'startDate',
+ 'type');
}
--
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.
