Author: sevein
Date: Thu May 3 18:20:02 2012
New Revision: 11631
Log:
Restore type column, being shown only when alphabetic tab is enabled.
Modified:
branches/2.0/apps/qubit/modules/actor/actions/browseAction.class.php
branches/2.0/apps/qubit/modules/actor/templates/browseSuccess.php
Modified: branches/2.0/apps/qubit/modules/actor/actions/browseAction.class.php
==============================================================================
--- branches/2.0/apps/qubit/modules/actor/actions/browseAction.class.php
Thu May 3 18:19:23 2012 (r11630)
+++ branches/2.0/apps/qubit/modules/actor/actions/browseAction.class.php
Thu May 3 18:20:02 2012 (r11631)
@@ -153,6 +153,8 @@
if ($this->pager->hasResults())
{
+ $this->types = array();
+
$facets = array();
foreach ($resultSet->getFacets() as $name => $facet)
{
@@ -173,14 +175,14 @@
foreach (QubitTerm::get($criteria) as $item)
{
- $types[$item->id] = $item->name;
+ $this->types[$item->id] = $item->name;
}
foreach ($facet['terms'] as $term)
{
$facets[strtr($name, '.', '_')]['terms'][$term['term']] = array(
'count' => $term['count'],
- 'term' => $types[$term['term']]);
+ 'term' => $this->types[$term['term']]);
}
break;
Modified: branches/2.0/apps/qubit/modules/actor/templates/browseSuccess.php
==============================================================================
--- branches/2.0/apps/qubit/modules/actor/templates/browseSuccess.php Thu May
3 18:19:23 2012 (r11630)
+++ branches/2.0/apps/qubit/modules/actor/templates/browseSuccess.php Thu May
3 18:20:02 2012 (r11631)
@@ -74,7 +74,9 @@
<?php endif; ?>
<?php endif; ?>
</th>
- <?php if ('lastUpdated' == $sortSetting || 'updatedDown' ==
$sf_request->sort || 'updatedUp' == $sf_request->sort): ?>
+ <?php if ('nameDown' == $sf_request->sort || 'nameUp' ==
$sf_request->sort || ('lastUpdated' != $sortSetting && 'updatedDown' !=
$sf_request->sort && 'updatedUp' != $sf_request->sort) ): ?>
+ <th><?php echo __('Type') ?></th>
+ <?php else: ?>
<th>
<?php echo __('Updated') ?>
<?php if ('updatedUp' == $sf_request->sort): ?>
@@ -93,12 +95,13 @@
<tr class="<?php echo 0 == @++$row % 2 ? 'even' : 'odd' ?>">
<td>
<?php echo
link_to($doc[$sf_user->getCulture()]['authorizedFormOfName'], array('module' =>
'actor', 'slug' => $doc['slug'])) ?>
+ </td><td>
+ <?php if ('nameDown' == $sf_request->sort || 'nameUp' ==
$sf_request->sort || ('lastUpdated' != $sortSetting && 'updatedDown' !=
$sf_request->sort && 'updatedUp' != $sf_request->sort) ): ?>
+ <?php echo $types[$doc['entityTypeId']] ?>
+ <?php else: ?>
+ <?php echo format_date($item->updatedAt, 'f') ?>
+ <?php endif; ?>
</td>
- <?php if ('lastUpdated' == $sortSetting || 'updatedDown' ==
$sf_request->sort || 'updatedUp' == $sf_request->sort): ?>
- <td>
- <?php echo format_date($doc['updatedAt'], 'f') ?>
- </td>
- <?php endif; ?>
</tr>
<?php endforeach; ?>
--
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.
