Author: david
Date: Thu Dec 3 11:34:24 2009
New Revision: 4058
Log:
Split up 'other' and 'parallel' forms of name.
Modified:
trunk/apps/qubit/modules/function/actions/showAction.class.php
trunk/apps/qubit/modules/function/templates/showIsdfSuccess.php
Modified: trunk/apps/qubit/modules/function/actions/showAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/function/actions/showAction.class.php Thu Dec
3 11:33:17 2009 (r4057)
+++ trunk/apps/qubit/modules/function/actions/showAction.class.php Thu Dec
3 11:34:24 2009 (r4058)
@@ -24,8 +24,8 @@
$this->func = QubitFunction::getById($this->getRequestParameter('id'));
$this->forward404Unless($this->func);
- $this->otherNames = $this->func->getOtherNames();
- $this->parallelNames = $this->func->getOtherNames();
+ $this->parallelNames = $this->func->getOtherNames(array('typeId' =>
QubitTerm::PARALLEL_FORM_OF_NAME_ID));
+ $this->otherNames = $this->func->getOtherNames(array('typeId' =>
QubitTerm::OTHER_FORM_OF_NAME_ID));
$this->maintenanceNotes = $this->func->getNotesByType(array('noteTypeId'
=> QubitTerm::MAINTENANCE_NOTE_ID));
Modified: trunk/apps/qubit/modules/function/templates/showIsdfSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/function/templates/showIsdfSuccess.php Thu Dec
3 11:33:17 2009 (r4057)
+++ trunk/apps/qubit/modules/function/templates/showIsdfSuccess.php Thu Dec
3 11:34:24 2009 (r4058)
@@ -35,16 +35,30 @@
</td></tr>
<?php endif; ?>
-<?php if (count($otherNames) > 0): ?>
- <tr><th><?php echo __('other names') ?></th><td>
- <?php foreach ($otherNames as $otherName): ?>
- <?php echo $otherName->getName(array('cultureFallback' => true)).'
('.$otherName->getType()->getName(array('cultureFallback' => true)).')' ?>
- <?php if ($otherName->getNote(array('cultureFallback' => true))): ?>
- <span class="note">--<?php echo
$otherName->getNote(array('cultureFallback' => true)) ?></span>
- <?php endif; ?>
- <br />
- <?php endforeach; ?>
- </td></tr>
+<?php if (0 < count($parallelNames)): ?>
+ <tr>
+ <th><?php echo __('parallel form(s) of name') ?></th>
+ <td>
+ <ul>
+ <?php foreach ($parallelNames as $parallelName): ?>
+ <li><?php echo $parallelName->getName(array('cultureFallback' =>
true)) ?></li>
+ <?php endforeach; ?>
+ </ul>
+ </td>
+ </tr>
+<?php endif; ?>
+
+<?php if (0 < count($otherNames)): ?>
+ <tr>
+ <th><?php echo __('other form(s) of name') ?></th>
+ <td>
+ <ul>
+ <?php foreach ($otherNames as $otherName): ?>
+ <li><?php echo $otherName->getName(array('cultureFallback' => true))
?></li>
+ <?php endforeach; ?>
+ </ul>
+ </td>
+ </tr>
<?php endif; ?>
<?php if (0 < strlen($value = $func->getClassification(array('cultureFallback'
=> true)))): ?>
--
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.
