Author: david
Date: Mon Jun 27 15:35:55 2011
New Revision: 9197
Log:
Use relation_i18n date and description columns. Refs
http://projects.artefactual.com/issues/21
Modified:
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedAuthorityRecord.php
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedFunction.php
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedResource.php
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/indexSuccess.php
Modified:
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedAuthorityRecord.php
==============================================================================
---
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedAuthorityRecord.php
Mon Jun 27 14:53:06 2011 (r9196)
+++
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedAuthorityRecord.php
Mon Jun 27 15:35:55 2011 (r9197)
@@ -31,9 +31,9 @@
<td>
<?php echo render_title($item->object) ?>
</td><td>
- <?php echo
$item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DESCRIPTION_ID) ?>
+ <?php echo $item->description ?>
</td><td>
- <?php echo
Qubit::renderDateStartEnd($item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DATE_ID),
$item->startDate, $item->endDate) ?>
+ <?php echo Qubit::renderDateStartEnd($item->date,
$item->startDate, $item->endDate) ?>
</td><td style="text-align: center">
<input class="multiDelete" name="deleteRelations[]"
type="checkbox" value="<?php echo url_for(array($item, 'module' => 'relation'))
?>"/>
</td>
Modified:
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedFunction.php
==============================================================================
---
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedFunction.php
Mon Jun 27 14:53:06 2011 (r9196)
+++
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedFunction.php
Mon Jun 27 15:35:55 2011 (r9197)
@@ -39,9 +39,9 @@
</td><td>
<?php echo $item->type ?>
</td><td>
- <?php echo
$item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DESCRIPTION_ID) ?>
+ <?php echo $item->description ?>
</td><td>
- <?php echo
Qubit::renderDateStartEnd($item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DATE_ID),
$item->startDate, $item->endDate) ?>
+ <?php echo Qubit::renderDateStartEnd($item->date,
$item->startDate, $item->endDate) ?>
</td><td style="text-align: center">
<input class="multiDelete" name="deleteRelations[]"
type="checkbox" value="<?php echo url_for(array($item, 'module' => 'relation'))
?>"/>
</td>
Modified:
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedResource.php
==============================================================================
---
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedResource.php
Mon Jun 27 14:53:06 2011 (r9196)
+++
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedResource.php
Mon Jun 27 15:35:55 2011 (r9197)
@@ -31,9 +31,9 @@
<td>
<?php echo render_title($item->object) ?>
</td><td>
- <?php echo
$item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DESCRIPTION_ID) ?>
+ <?php echo $item->description ?>
</td><td>
- <?php echo
Qubit::renderDateStartEnd($item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DATE_ID),
$item->startDate, $item->endDate) ?>
+ <?php echo Qubit::renderDateStartEnd($item->date,
$item->startDate, $item->endDate) ?>
</td><td style="text-align: center">
<input class="multiDelete" name="deleteRelations[]"
type="checkbox" value="<?php echo url_for(array($item, 'module' => 'relation'))
?>"/>
</td>
Modified:
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/indexSuccess.php
==============================================================================
--- trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/indexSuccess.php
Mon Jun 27 14:53:06 2011 (r9196)
+++ trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/indexSuccess.php
Mon Jun 27 15:35:55 2011 (r9197)
@@ -79,9 +79,9 @@
<?php echo render_show(__('Category of relationship'),
render_value($item->type)) ?>
- <?php echo render_show(__('Description of relationship'),
render_value($item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DESCRIPTION_ID)))
?>
+ <?php echo render_show(__('Description of relationship'),
render_value($item->description)) ?>
- <?php echo render_show(__('Dates of relationship'),
Qubit::renderDateStartEnd($item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DATE_ID),
$item->startDate, $item->endDate)) ?>
+ <?php echo render_show(__('Dates of relationship'),
Qubit::renderDateStartEnd($item->date, $item->startDate, $item->endDate)) ?>
</div>
</div>
@@ -96,11 +96,11 @@
<?php echo render_show(__('Identifier'),
render_value($item->object->descriptionIdentifier)) ?>
- <?php if (null !== $note =
$item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DESCRIPTION_ID)): ?>
+ <?php if (null !== $note = $item->description): ?>
<?php echo render_show(__('Nature of relationship'),
render_value($note->getContent(array('cultureFallback' => true)))) ?>
<?php endif; ?>
- <?php echo render_show(__('Dates of the relationship'),
Qubit::renderDateStartEnd($item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DATE_ID),
$item->startDate, $item->endDate)) ?>
+ <?php echo render_show(__('Dates of the relationship'),
Qubit::renderDateStartEnd($item->date, $item->startDate, $item->endDate)) ?>
</div>
</div>
@@ -116,11 +116,11 @@
<?php $isad = new sfIsadPlugin($item->object); echo
render_show(__('Identifier'), $isad->referenceCode) ?>
- <?php if (null !== $note =
$item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DESCRIPTION_ID)): ?>
- <?php echo render_show(__('Nature of relationship'),
render_value($note->getContent(array('cultureFallback' => true)))) ?>
+ <?php if (null !== $item->description): ?>
+ <?php echo render_show(__('Nature of relationship'),
render_value($item->description))) ?>
<?php endif; ?>
- <?php echo render_show(__('Dates of the relationship'),
Qubit::renderDateStartEnd($item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DATE_ID),
$item->startDate, $item->endDate)) ?>
+ <?php echo render_show(__('Dates of the relationship'),
Qubit::renderDateStartEnd($item->date, $item->startDate, $item->endDate)) ?>
</div>
</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.
