Author: jablko
Date: Mon Nov 1 12:53:17 2010
New Revision: 8744
Log:
Use render_title(), fixes issue 1500
Modified:
trunk/apps/qubit/modules/physicalobject/templates/autocompleteSuccess.php
trunk/lib/model/QubitPhysicalObject.php
trunk/plugins/sfDcPlugin/modules/sfDcPlugin/templates/indexSuccess.php
trunk/plugins/sfIsadPlugin/modules/sfIsadPlugin/templates/_event.php
Modified:
trunk/apps/qubit/modules/physicalobject/templates/autocompleteSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/physicalobject/templates/autocompleteSuccess.php
Mon Nov 1 12:26:21 2010 (r8743)
+++ trunk/apps/qubit/modules/physicalobject/templates/autocompleteSuccess.php
Mon Nov 1 12:53:17 2010 (r8744)
@@ -3,7 +3,7 @@
<?php foreach ($physicalObjects as $item): ?>
<tr class="<?php echo 0 == ++$row % 2 ? 'even' : 'odd' ?>">
<td>
- <?php echo link_to($item, array($item, 'module' =>
'physicalobject')) ?>
+ <?php echo link_to(render_title($item), array($item, 'module' =>
'physicalobject')) ?>
</td>
</tr>
<?php endforeach; ?>
Modified: trunk/lib/model/QubitPhysicalObject.php
==============================================================================
--- trunk/lib/model/QubitPhysicalObject.php Mon Nov 1 12:26:21 2010
(r8743)
+++ trunk/lib/model/QubitPhysicalObject.php Mon Nov 1 12:53:17 2010
(r8744)
@@ -26,12 +26,13 @@
*/
public function __toString()
{
- if (!$this->getName())
+ $string = $this->name;
+ if (!isset($string))
{
- return (string) $this->getName(array('sourceCulture' => true));
+ $string = $this->getName(array('sourceCulture' => true));
}
- return (string) $this->getName();
+ return (string) $string;
}
public function insert($connection = null)
Modified: trunk/plugins/sfDcPlugin/modules/sfDcPlugin/templates/indexSuccess.php
==============================================================================
--- trunk/plugins/sfDcPlugin/modules/sfDcPlugin/templates/indexSuccess.php
Mon Nov 1 12:26:21 2010 (r8743)
+++ trunk/plugins/sfDcPlugin/modules/sfDcPlugin/templates/indexSuccess.php
Mon Nov 1 12:53:17 2010 (r8744)
@@ -72,7 +72,7 @@
<?php echo render_show_repository(__('Relation (isLocatedAt)'), $resource) ?>
<?php foreach ($dc->coverage as $item): ?>
- <?php echo render_show(__('Coverage (spatial)'), link_to($item, array($item,
'module' => 'term', 'action' => 'browseTerm'))) ?>
+ <?php echo render_show(__('Coverage (spatial)'),
link_to(render_title($item), array($item, 'module' => 'term', 'action' =>
'browseTerm'))) ?>
<?php endforeach; ?>
<?php echo render_show(__('Rights'),
render_value($resource->getAccessConditions(array('cultureFallback' => true))))
?>
Modified: trunk/plugins/sfIsadPlugin/modules/sfIsadPlugin/templates/_event.php
==============================================================================
--- trunk/plugins/sfIsadPlugin/modules/sfIsadPlugin/templates/_event.php
Mon Nov 1 12:26:21 2010 (r8743)
+++ trunk/plugins/sfIsadPlugin/modules/sfIsadPlugin/templates/_event.php
Mon Nov 1 12:53:17 2010 (r8744)
@@ -55,7 +55,7 @@
<?php $form->getWidgetSchema()->setNameFormat("editEvents[$i][%s]");
$i++ ?>
- <tr class="date">
+ <tr class="date <?php echo 0 == ++$row % 2 ? 'even' : 'odd' ?>">
<td>
<div class="animateNicely">
<?php echo $form->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.
