Author: sevein
Date: Thu Apr 14 09:29:58 2011
New Revision: 9074
Log:
New default sort based on whether used logged in and add institution column to
'recent changes' view to repository browser screen (see issues 1951 and 1932).
Wu's contribution.
Modified:
trunk/apps/qubit/modules/repository/actions/browseAction.class.php
trunk/apps/qubit/modules/repository/templates/browseSuccess.php
Modified: trunk/apps/qubit/modules/repository/actions/browseAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/repository/actions/browseAction.class.php Thu Apr
14 09:08:56 2011 (r9073)
+++ trunk/apps/qubit/modules/repository/actions/browseAction.class.php Thu Apr
14 09:29:58 2011 (r9074)
@@ -50,7 +50,6 @@
break;
case 'updatedDown':
- default:
$criteria->addDescendingOrderByColumn(QubitObject::UPDATED_AT);
break;
@@ -59,6 +58,16 @@
$criteria->addAscendingOrderByColumn(QubitObject::UPDATED_AT);
break;
+
+ default:
+ if (!$this->getUser()->isAuthenticated())
+ {
+ $criteria->addAscendingOrderByColumn('authorized_form_of_name');
+ }
+ else
+ {
+ $criteria->addDescendingOrderByColumn(QubitObject::UPDATED_AT);
+ }
}
// Page results
@@ -67,4 +76,4 @@
$this->pager->setMaxPerPage($request->limit);
$this->pager->setPage($request->page);
}
-}
+}
\ No newline at end of file
Modified: trunk/apps/qubit/modules/repository/templates/browseSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/repository/templates/browseSuccess.php Thu Apr
14 09:08:56 2011 (r9073)
+++ trunk/apps/qubit/modules/repository/templates/browseSuccess.php Thu Apr
14 09:29:58 2011 (r9074)
@@ -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>
@@ -18,7 +23,6 @@
<table class="sticky-enabled">
<thead>
<tr>
-
<th>
<?php echo __('Name') ?>
<?php if ('nameDown' == $sf_request->sort): ?>
@@ -27,7 +31,6 @@
<?php echo link_to(image_tag('down.gif'), array('sort' =>
'nameDown') + $sf_request->getParameterHolder()->getAll(), array('title' =>
__('Sort'))) ?>
<?php endif; ?>
</th>
-
<?php if ('nameDown' == $sf_request->sort || 'nameUp' ==
$sf_request->sort): ?>
<th>
<?php echo __('Type') ?>
@@ -39,7 +42,7 @@
<?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 else: ?>
+ <?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; ?>
</th>
@@ -49,11 +52,9 @@
</thead><tbody>
<?php foreach ($pager->getResults() as $item): ?>
<tr class="<?php echo 0 == ++$row % 2 ? 'even' : 'odd' ?>">
-
<td>
<?php echo link_to(render_title($item), array($item, 'module' =>
'repository')) ?>
</td>
-
<?php if ('nameDown' == $sf_request->sort || 'nameUp' ==
$sf_request->sort): ?>
<td>
<ul>
@@ -69,7 +70,6 @@
<?php echo format_date($item->updatedAt, 'f') ?>
</td>
<?php endif; ?>
-
</tr>
<?php endforeach; ?>
</tbody>
@@ -82,4 +82,4 @@
<input name="subquery" value="<?php echo
esc_entities($sf_request->subquery) ?>"/>
<input class="form-submit" type="submit" value="<?php echo __('Search
%1%', array('%1%' => sfConfig::get('app_ui_label_repository'))) ?>"/>
</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.
