Author: sevein
Date: Thu Apr 14 10:13:30 2011
New Revision: 9076
Log:
New default sort based on whether used logged in and add institution column to
'recent changes' view to function browser screen (see issues 1951 and 1932).
Thanks to Wu.
Modified:
trunk/apps/qubit/modules/function/actions/browseAction.class.php
trunk/apps/qubit/modules/function/templates/browseSuccess.php
Modified: trunk/apps/qubit/modules/function/actions/browseAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/function/actions/browseAction.class.php Thu Apr
14 10:07:34 2011 (r9075)
+++ trunk/apps/qubit/modules/function/actions/browseAction.class.php Thu Apr
14 10:13:30 2011 (r9076)
@@ -33,6 +33,7 @@
}
$criteria = new Criteria;
+
switch ($request->sort)
{
case 'nameDown':
@@ -46,7 +47,7 @@
break;
case 'updatedDown':
- default:
+
$criteria->addDescendingOrderByColumn(QubitObject::UPDATED_AT);
break;
@@ -55,6 +56,16 @@
$criteria->addAscendingOrderByColumn(QubitObject::UPDATED_AT);
break;
+
+ default:
+ if (!$this->getUser()->isAuthenticated())
+ {
+ $criteria->addAscendingOrderByColumn('authorized_form_of_name');
+ }
+ else
+ {
+ $criteria->addDescendingOrderByColumn(QubitObject::UPDATED_AT);
+ }
}
// Do source culture fallback
@@ -66,4 +77,4 @@
$this->pager->setMaxPerPage($request->limit);
$this->pager->setPage($request->page);
}
-}
+}
\ No newline at end of file
Modified: trunk/apps/qubit/modules/function/templates/browseSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/function/templates/browseSuccess.php Thu Apr
14 10:07:34 2011 (r9075)
+++ trunk/apps/qubit/modules/function/templates/browseSuccess.php Thu Apr
14 10:13:30 2011 (r9076)
@@ -6,8 +6,13 @@
<div class="content">
<ul class="clearfix links">
- <li<?php if ('nameDown' != $sf_request->sort && 'nameUp' !=
$sf_request->sort): ?> class="active"<?php endif; ?>><?php echo
link_to(__('Recent changes'), array('sort' => 'updatedDown') +
$sf_request->getParameterHolder()->getAll(), array('title' => __('Sort')))
?></li>
- <li<?php if ('nameDown' == $sf_request->sort || 'nameUp' ==
$sf_request->sort): ?> class="active"<?php endif; ?>><?php echo
link_to(__('Alphabetic'), array('sort' => 'nameUp') +
$sf_request->getParameterHolder()->getAll(), array('title' => __('Sort')))
?></li>
+ <?php if ($sf_user->isAuthenticated()): ?>
+ <li<?php if ('nameDown' != $sf_request->sort && 'nameUp' !=
$sf_request->sort): ?> class="active"<?php endif; ?>><?php echo
link_to(__('Recent changes'), array('sort' => 'updatedDown') +
$sf_request->getParameterHolder()->getAll(), array('title' => __('Sort')))
?></li>
+ <li<?php if ('nameDown' == $sf_request->sort || 'nameUp' ==
$sf_request->sort): ?> class="active"<?php endif; ?>><?php echo
link_to(__('Alphabetic'), array('sort' => 'nameUp') +
$sf_request->getParameterHolder()->getAll(), array('title' => __('Sort')))
?></li>
+ <?php else: ?>
+ <li<?php if ('updatedDown' == $sf_request->sort || 'updatedUp' ==
$sf_request->sort): ?> class="active"<?php endif; ?>><?php echo
link_to(__('Recent changes'), array('sort' => 'updatedDown') +
$sf_request->getParameterHolder()->getAll(), array('title' => __('Sort')))
?></li>
+ <li<?php if ('updatedDown' != $sf_request->sort && 'updatedUp' !=
$sf_request->sort): ?> class="active"<?php endif; ?>><?php echo
link_to(__('Alphabetic'), array('sort' => 'nameUp') +
$sf_request->getParameterHolder()->getAll(), array('title' => __('Sort')))
?></li>
+ <?php endif; ?>
</ul>
</div>
@@ -21,11 +26,21 @@
<th>
<?php echo __('Name') ?>
- <?php if ('nameDown' == $sf_request->sort): ?>
- <?php echo link_to(image_tag('up.gif'), array('sort' => 'nameUp') +
$sf_request->getParameterHolder()->getAll(), array('title' => __('Sort'))) ?>
- <?php elseif ('nameUp' == $sf_request->sort): ?>
- <?php echo link_to(image_tag('down.gif'), array('sort' =>
'nameDown') + $sf_request->getParameterHolder()->getAll(), array('title' =>
__('Sort'))) ?>
- <?php endif; ?>
+ <?php if ($sf_user->isAuthenticated()): ?>
+ <?php if ('nameDown' == $sf_request->sort): ?>
+ <?php echo link_to(image_tag('up.gif'), array('sort' => 'nameUp')
+ $sf_request->getParameterHolder()->getAll(), array('title' => __('Sort'))) ?>
+ <?php elseif ('nameUp' == $sf_request->sort): ?>
+ <?php echo link_to(image_tag('down.gif'), array('sort' =>
'nameDown') + $sf_request->getParameterHolder()->getAll(), array('title' =>
__('Sort'))) ?>
+ <?php endif; ?>
+ <?php else: ?>
+ <?php if ('nameDown' == $sf_request->sort): ?>
+ <?php echo link_to(image_tag('up.gif'), array('sort' => 'nameUp')
+ $sf_request->getParameterHolder()->getAll(), array('title' => __('Sort'))) ?>
+ <?php elseif ('nameUp' == $sf_request->sort): ?>
+ <?php echo link_to(image_tag('down.gif'), array('sort' =>
'nameDown') + $sf_request->getParameterHolder()->getAll(), array('title' =>
__('Sort'))) ?>
+ <?php elseif ('' == $sf_request->sort): ?>
+ <?php echo link_to(image_tag('up.gif'), array('sort' => 'nameUp')
+ $sf_request->getParameterHolder()->getAll(), array('title' => __('Sort'))) ?>
+ <?php endif; ?>
+ <?php endif; ?>
</th>
<?php if ('nameDown' == $sf_request->sort || 'nameUp' ==
$sf_request->sort): ?>
@@ -35,11 +50,19 @@
<?php else: ?>
<th>
<?php echo __('Updated') ?>
- <?php if ('updatedUp' == $sf_request->sort): ?>
- <?php echo link_to(image_tag('up.gif'), array('sort' =>
'updatedDown') + $sf_request->getParameterHolder()->getAll(), array('title' =>
__('Sort'))) ?>
+ <?php if ($sf_user->isAuthenticated()): ?>
+ <?php if ('updatedUp' == $sf_request->sort): ?>
+ <?php echo link_to(image_tag('up.gif'), array('sort' =>
'updatedDown') + $sf_request->getParameterHolder()->getAll(), array('title' =>
__('Sort'))) ?>
+ <?php else: ?>
+ <?php echo link_to(image_tag('down.gif'), array('sort' =>
'updatedUp') + $sf_request->getParameterHolder()->getAll(), array('title' =>
__('Sort'))) ?>
+ <?php endif; ?>
<?php else: ?>
- <?php echo link_to(image_tag('down.gif'), array('sort' =>
'updatedUp') + $sf_request->getParameterHolder()->getAll(), array('title' =>
__('Sort'))) ?>
- <?php endif; ?>
+ <?php if ('updatedUp' == $sf_request->sort): ?>
+ <?php echo link_to(image_tag('up.gif'), array('sort' =>
'updatedDown') + $sf_request->getParameterHolder()->getAll(), array('title' =>
__('Sort'))) ?>
+ <?php elseif ('updatedDown' == $sf_request->sort): ?>
+ <?php echo link_to(image_tag('down.gif'), array('sort' =>
'updatedUp') + $sf_request->getParameterHolder()->getAll(), array('title' =>
__('Sort'))) ?>
+ <?php endif; ?>
+ <?php endif; ?>
</th>
<?php endif; ?>
@@ -74,4 +97,4 @@
<input name="subquery" value="<?php echo
esc_entities($sf_request->subquery) ?>"/>
<input class="form-submit" type="submit" value="<?php echo __('Search
function') ?>"/>
</form>
-</div>
+</div>
\ No newline at end of file
--
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.
