Author: david
Date: Wed Sep 21 11:18:22 2011
New Revision: 9774
Log:
Revert to up/down terminology for sort columns
Modified:
trunk/apps/qubit/modules/physicalobject/actions/browseAction.class.php
trunk/apps/qubit/modules/physicalobject/templates/browseSuccess.php
Modified: trunk/apps/qubit/modules/physicalobject/actions/browseAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/physicalobject/actions/browseAction.class.php
Wed Sep 21 11:16:40 2011 (r9773)
+++ trunk/apps/qubit/modules/physicalobject/actions/browseAction.class.php
Wed Sep 21 11:18:22 2011 (r9774)
@@ -38,35 +38,35 @@
switch ($request->sort)
{
- case 'nameDescending':
- $criteria->addDescendingOrderByColumn('name');
+ case 'nameDown':
+ $criteria->addDownOrderByColumn('name');
break;
- case 'locationDescending':
- $criteria->addDescendingOrderByColumn('location');
+ case 'locationDown':
+ $criteria->addDownOrderByColumn('location');
break;
- case 'locationAscending':
- $criteria->addAscendingOrderByColumn('location');
+ case 'locationUp':
+ $criteria->addUpOrderByColumn('location');
break;
- case 'typeDescending':
- $criteria->addDescendingOrderByColumn('type');
+ case 'typeDown':
+ $criteria->addDownOrderByColumn('type');
break;
- case 'typeAscending':
- $criteria->addAscendingOrderByColumn('type');
+ case 'typeUp':
+ $criteria->addUpOrderByColumn('type');
break;
- case 'nameAscending':
+ case 'nameUp':
default:
- $request->sort = 'nameAscending';
- $criteria->addAscendingOrderByColumn('name');
+ $request->sort = 'nameUp';
+ $criteria->addUpOrderByColumn('name');
}
// Page results
Modified: trunk/apps/qubit/modules/physicalobject/templates/browseSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/physicalobject/templates/browseSuccess.php Wed Sep
21 11:16:40 2011 (r9773)
+++ trunk/apps/qubit/modules/physicalobject/templates/browseSuccess.php Wed Sep
21 11:18:22 2011 (r9774)
@@ -6,13 +6,13 @@
<thead>
<tr>
<th class="sortable">
- <?php echo link_to(__('Name'), array('sort' => ('nameAscending' ==
$sf_request->sort) ? 'nameDescending' : 'nameAscending') +
$sf_request->getParameterHolder()->getAll(), array('title' => __('Sort'),
'class' => 'sortable')) ?>
+ <?php echo link_to(__('Name'), array('sort' => ('nameUp' ==
$sf_request->sort) ? 'nameDown' : 'nameUp') +
$sf_request->getParameterHolder()->getAll(), array('title' => __('Sort'),
'class' => 'sortable')) ?>
</th>
<th class="sortable">
- <?php echo link_to(__('Location'), array('sort' =>
('locationAscending' == $sf_request->sort) ? 'locationDescending' :
'locationAscending') + $sf_request->getParameterHolder()->getAll(),
array('title' => __('Sort'), 'class' => 'sortable')) ?>
+ <?php echo link_to(__('Location'), array('sort' => ('locationUp' ==
$sf_request->sort) ? 'locationDown' : 'locationUp') +
$sf_request->getParameterHolder()->getAll(), array('title' => __('Sort'),
'class' => 'sortable')) ?>
</th>
<th class="sortable">
- <?php echo link_to(__('Type'), array('sort' => ('typeAscending' ==
$sf_request->sort) ? 'typeDescending' : 'typeAscending') +
$sf_request->getParameterHolder()->getAll(), array('title' => __('Sort'),
'class' => 'sortable')) ?>
+ <?php echo link_to(__('Type'), array('sort' => ('typeUp' ==
$sf_request->sort) ? 'typeDown' : 'typeUp') +
$sf_request->getParameterHolder()->getAll(), array('title' => __('Sort'),
'class' => 'sortable')) ?>
</th>
</tr>
</thead><tbody>
--
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.
