Author: david
Date: Thu Oct 28 21:06:49 2010
New Revision: 8644
Log:
Rollback r8640 and restore term constant to RELATION_NOTE_DATE_ID like r8551.
Modified:
trunk/apps/qubit/modules/relation/actions/editComponent.class.php
trunk/apps/qubit/modules/relation/actions/indexAction.class.php
trunk/data/fixtures/taxonomyTerms.yml
trunk/lib/model/QubitTerm.php
trunk/lib/task/migrate/QubitMigrate109.class.php
trunk/plugins/sfEacPlugin/lib/sfEacPlugin.class.php
trunk/plugins/sfEacPlugin/modules/sfEacPlugin/templates/indexSuccess.xml.php
trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_relatedAuthorityRecord.php
trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/indexSuccess.php
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/apps/qubit/modules/relation/actions/editComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/relation/actions/editComponent.class.php Thu Oct
28 19:26:53 2010 (r8643)
+++ trunk/apps/qubit/modules/relation/actions/editComponent.class.php Thu Oct
28 21:06:49 2010 (r8644)
@@ -70,7 +70,7 @@
switch ($field->getName())
{
case 'date':
- $this->relation->updateNote($this->form->getValue('date'),
QubitTerm::RELATION_NOTE_DATE_DISPLAY_ID);
+ $this->relation->updateNote($this->form->getValue('date'),
QubitTerm::RELATION_NOTE_DATE_ID);
break;
Modified: trunk/apps/qubit/modules/relation/actions/indexAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/relation/actions/indexAction.class.php Thu Oct
28 19:26:53 2010 (r8643)
+++ trunk/apps/qubit/modules/relation/actions/indexAction.class.php Thu Oct
28 21:06:49 2010 (r8644)
@@ -33,7 +33,7 @@
$value = array();
- $note =
$this->resource->getNoteByTypeId(QubitTerm::RELATION_NOTE_DATE_DISPLAY_ID);
+ $note = $this->resource->getNoteByTypeId(QubitTerm::RELATION_NOTE_DATE_ID);
if (isset($note))
{
$value['date'] = $note->content;
Modified: trunk/data/fixtures/taxonomyTerms.yml
==============================================================================
--- trunk/data/fixtures/taxonomyTerms.yml Thu Oct 28 19:26:53 2010
(r8643)
+++ trunk/data/fixtures/taxonomyTerms.yml Thu Oct 28 21:06:49 2010
(r8644)
@@ -846,7 +846,7 @@
QubitTerm_actor_relation_date:
taxonomy_id: QubitTaxonomy_actor_relation_note_type
parent_id: QubitTerm_110
- id: <?php echo QubitTerm::RELATION_NOTE_DATE_DISPLAY_ID."\n" ?>
+ id: <?php echo QubitTerm::RELATION_NOTE_DATE_ID."\n" ?>
source_culture: en
name:
en: 'date display'
Modified: trunk/lib/model/QubitTerm.php
==============================================================================
--- trunk/lib/model/QubitTerm.php Thu Oct 28 19:26:53 2010 (r8643)
+++ trunk/lib/model/QubitTerm.php Thu Oct 28 21:06:49 2010 (r8644)
@@ -98,7 +98,7 @@
// Actor relation note taxonomy
RELATION_NOTE_DESCRIPTION_ID = 154,
- RELATION_NOTE_DATE_DISPLAY_ID = 155,
+ RELATION_NOTE_DATE_ID = 155,
// Term relation taxonomy
ALTERNATIVE_LABEL_ID = 156,
@@ -168,7 +168,7 @@
QubitTerm::PUBLICATION_STATUS_PUBLISHED_ID,
QubitTerm::PUBLISHED_MATERIAL_ID,
QubitTerm::REFERENCE_ID,
- QubitTerm::RELATION_NOTE_DATE_DISPLAY_ID,
+ QubitTerm::RELATION_NOTE_DATE_ID,
QubitTerm::RELATION_NOTE_DESCRIPTION_ID,
QubitTerm::ROOT_ID,
QubitTerm::SCOPE_NOTE_ID,
Modified: trunk/lib/task/migrate/QubitMigrate109.class.php
==============================================================================
--- trunk/lib/task/migrate/QubitMigrate109.class.php Thu Oct 28 19:26:53
2010 (r8643)
+++ trunk/lib/task/migrate/QubitMigrate109.class.php Thu Oct 28 21:06:49
2010 (r8644)
@@ -769,10 +769,10 @@
'ASSOCIATIVE_RELATION_ID',
//Relation NOTE type taxonomy
'RELATION_NOTE_DESCRIPTION_ID',
- 'RELATION_NOTE_DATE_DISPLAY_ID',
+ 'RELATION_NOTE_DATE_ID',
//Actor relation note taxonomy
'RELATION_NOTE_DESCRIPTION_ID',
- 'RELATION_NOTE_DATE_DISPLAY_ID',
+ 'RELATION_NOTE_DATE_ID',
//Term relation taxonomy
'ALTERNATIVE_LABEL_ID',
'TERM_RELATION_ASSOCIATIVE_ID',
Modified: trunk/plugins/sfEacPlugin/lib/sfEacPlugin.class.php
==============================================================================
--- trunk/plugins/sfEacPlugin/lib/sfEacPlugin.class.php Thu Oct 28 19:26:53
2010 (r8643)
+++ trunk/plugins/sfEacPlugin/lib/sfEacPlugin.class.php Thu Oct 28 21:06:49
2010 (r8644)
@@ -567,7 +567,7 @@
}
$note = new QubitNote;
- $note->typeId = QubitTerm::RELATION_NOTE_DATE_DISPLAY_ID;
+ $note->typeId = QubitTerm::RELATION_NOTE_DATE_ID;
$note->scope = 'QubitRelation';
$note->content = substr($display, 2);
Modified:
trunk/plugins/sfEacPlugin/modules/sfEacPlugin/templates/indexSuccess.xml.php
==============================================================================
---
trunk/plugins/sfEacPlugin/modules/sfEacPlugin/templates/indexSuccess.xml.php
Thu Oct 28 19:26:53 2010 (r8643)
+++
trunk/plugins/sfEacPlugin/modules/sfEacPlugin/templates/indexSuccess.xml.php
Thu Oct 28 21:06:49 2010 (r8644)
@@ -177,7 +177,7 @@
<cpfRelation cpfRelationType="<?php echo
sfEacPlugin::toCpfRelationType($item->type->id) ?>" xlink:href="<?php echo
url_for(array($item->object, 'module' => 'actor'), true) ?>"
xlink:type="simple">
<relationEntry><?php echo
render_title($item->getOpposedObject($resource)) ?></relationEntry>
<?php echo sfEacPlugin::renderDates($item) ?>
-<?php if (0 < count($date = $item->getNotesByType(array('noteTypeId' =>
QubitTerm::RELATION_NOTE_DATE_DISPLAY_ID)))): ?>
+<?php if (0 < count($date = $item->getNotesByType(array('noteTypeId' =>
QubitTerm::RELATION_NOTE_DATE_ID)))): ?>
<descriptiveNote>
<?php echo render_value('<p>'.$date[0]).'</p>' ?>
</descriptiveNote>
@@ -203,7 +203,7 @@
<functionRelation xlink:href="<?php echo url_for(array($item, 'module'
=> 'function'), true) ?>" xlink:type="simple">
<relationEntry><?php echo render_title($item->subject)
?></relationEntry>
<?php echo sfEacPlugin::renderDates($item) ?>
-<?php if (0 < count($date = $item->getNotesByType(array('noteTypeId' =>
QubitTerm::RELATION_NOTE_DATE_DISPLAY_ID)))): ?>
+<?php if (0 < count($date = $item->getNotesByType(array('noteTypeId' =>
QubitTerm::RELATION_NOTE_DATE_ID)))): ?>
<descriptiveNote>
<?php echo render_value('<p>'.$date[0]).'</p>' ?>
</descriptiveNote>
Modified:
trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_relatedAuthorityRecord.php
==============================================================================
---
trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_relatedAuthorityRecord.php
Thu Oct 28 19:26:53 2010 (r8643)
+++
trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_relatedAuthorityRecord.php
Thu Oct 28 21:06:49 2010 (r8644)
@@ -39,7 +39,7 @@
</td><td>
<?php echo $item->type ?>
</td><td>
- <?php echo
Qubit::renderDateStartEnd($item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DATE_DISPLAY_ID),
$item->startDate, $item->endDate) ?>
+ <?php echo
Qubit::renderDateStartEnd($item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DATE_ID),
$item->startDate, $item->endDate) ?>
</td><td>
<?php echo
$item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DESCRIPTION_ID) ?>
</td><td style="text-align: center">
Modified:
trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/indexSuccess.php
==============================================================================
---
trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/indexSuccess.php
Thu Oct 28 19:26:53 2010 (r8643)
+++
trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/indexSuccess.php
Thu Oct 28 21:06:49 2010 (r8644)
@@ -78,7 +78,7 @@
<?php echo render_show(__('Category of the relationship'),
render_value($item->type)) ?>
- <?php echo render_show(__('Dates of the relationship'),
Qubit::renderDateStartEnd($item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DATE_DISPLAY_ID),
$item->startDate, $item->endDate)) ?>
+ <?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(__('Description of relationship'),
render_value($item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DESCRIPTION_ID)))
?>
Modified:
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedAuthorityRecord.php
==============================================================================
---
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedAuthorityRecord.php
Thu Oct 28 19:26:53 2010 (r8643)
+++
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedAuthorityRecord.php
Thu Oct 28 21:06:49 2010 (r8644)
@@ -33,7 +33,7 @@
</td><td>
<?php echo
$item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DESCRIPTION_ID) ?>
</td><td>
- <?php echo
Qubit::renderDateStartEnd($item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DATE_DISPLAY_ID),
$item->startDate, $item->endDate) ?>
+ <?php echo
Qubit::renderDateStartEnd($item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DATE_ID),
$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
Thu Oct 28 19:26:53 2010 (r8643)
+++
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedFunction.php
Thu Oct 28 21:06:49 2010 (r8644)
@@ -41,7 +41,7 @@
</td><td>
<?php echo
$item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DESCRIPTION_ID) ?>
</td><td>
- <?php echo
Qubit::renderDateStartEnd($item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DATE_DISPLAY_ID),
$item->startDate, $item->endDate) ?>
+ <?php echo
Qubit::renderDateStartEnd($item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DATE_ID),
$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
Thu Oct 28 19:26:53 2010 (r8643)
+++
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedResource.php
Thu Oct 28 21:06:49 2010 (r8644)
@@ -33,7 +33,7 @@
</td><td>
<?php echo
$item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DESCRIPTION_ID) ?>
</td><td>
- <?php echo
Qubit::renderDateStartEnd($item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DATE_DISPLAY_ID),
$item->startDate, $item->endDate) ?>
+ <?php echo
Qubit::renderDateStartEnd($item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DATE_ID),
$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
Thu Oct 28 19:26:53 2010 (r8643)
+++ trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/indexSuccess.php
Thu Oct 28 21:06:49 2010 (r8644)
@@ -81,7 +81,7 @@
<?php echo render_show(__('Description of relationship'),
render_value($item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DESCRIPTION_ID)))
?>
- <?php echo render_show(__('Dates of relationship'),
Qubit::renderDateStartEnd($item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DATE_DISPLAY_ID),
$item->startDate, $item->endDate)) ?>
+ <?php echo render_show(__('Dates of relationship'),
Qubit::renderDateStartEnd($item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DATE_ID),
$item->startDate, $item->endDate)) ?>
</div>
</div>
@@ -100,7 +100,7 @@
<?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_DISPLAY_ID),
$item->startDate, $item->endDate)) ?>
+ <?php echo render_show(__('Dates of the relationship'),
Qubit::renderDateStartEnd($item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DATE_ID),
$item->startDate, $item->endDate)) ?>
</div>
</div>
@@ -120,7 +120,7 @@
<?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_DISPLAY_ID),
$item->startDate, $item->endDate)) ?>
+ <?php echo render_show(__('Dates of the relationship'),
Qubit::renderDateStartEnd($item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DATE_ID),
$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.
