issue 1262 fixed

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10160 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-02-21 08:11:10 +00:00
parent 89cd0aa7a7
commit e5c075493c
2 changed files with 16 additions and 8 deletions

View file

@ -86,11 +86,19 @@
// Change the query id if selected_group_srl exists (for table join)
$sort_order = Context::get('sort_order');
$sort_index = Context::get('sort_index');
if($sort_index != 'last_login') {
if(!$sort_index) {
$sort_index = "list_order";
}else{
$sort_order = 'desc';
}
if(!$sort_order) {
$sort_order = 'desc';
}
if($sort_order != 'desc')
{
$sort_order = 'asc';
}
if($args->selected_group_srl) {
$query_id = 'member.getMemberListWithinGroup';
$args->sort_index = "member.".$sort_index;
@ -98,7 +106,7 @@
$query_id = 'member.getMemberList';
$args->sort_index = $sort_index;
}
if($sort_order != "desc") $sort_order = "asc";
$args->sort_order = $sort_order;
Context::set('sort_order', $sort_order);
// Other variables

View file

@ -30,8 +30,8 @@
<tr>
<th scope="col">{$lang->email}</th>
<th scope="col" loop="$usedIdentifiers=>$name,$title">{$title}</th>
<th scope="col"><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminList')}">{$lang->signup_date}</a></th>
<th scope="col"><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminList', 'sort_index', 'last_login', 'sort_order', 'asc')}">{$lang->last_login}</a></th>
<th scope="col"><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminList', 'sort_index', 'regdate', 'sort_order', ($sort_order == 'asc') ? 'desc' : 'asc')}">{$lang->signup_date}<block cond="$sort_index == 'regdate'"> <em cond="$sort_order=='asc'"></em><em cond="$sort_order != 'asc'"></em></block></a></th>
<th scope="col"><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminList', 'sort_index', 'last_login', 'sort_order', ($sort_order == 'asc') ? 'desc' : 'asc')}">{$lang->last_login}<block cond="$sort_index == 'last_login'"> <em cond="$sort_order=='asc'"></em><em cond="$sort_order != 'asc'"></em></block></a></th>
<th scope="col" class="text">{$lang->member_group}</th>
<th scope="col">{$lang->status}</th>
<th scope="col">{$lang->cmd_view}</th>
@ -45,8 +45,8 @@
<tr>
<th scope="col">{$lang->email}</th>
<th scope="col" loop="$usedIdentifiers=>$name,$title">{$title}</th>
<th scope="col"><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminList')}">{$lang->signup_date}</a></th>
<th scope="col"><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminList', 'sort_index', 'last_login', 'sort_order', 'asc')}">{$lang->last_login}</a></th>
<th scope="col"><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminList', 'sort_index', 'regdate', 'sort_order', ($sort_order == 'asc') ? 'desc' : 'asc')}">{$lang->signup_date}<block cond="$sort_index == 'regdate'"> <em cond="$sort_order=='asc'"></em><em cond="$sort_order != 'asc'"></em></block></a></th>
<th scope="col"><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminList', 'sort_index', 'last_login', 'sort_order', ($sort_order == 'asc') ? 'desc' : 'asc')}">{$lang->last_login}<block cond="$sort_index == 'last_login'"> <em cond="$sort_order=='asc'"></em><em cond="$sort_order != 'asc'"></em></block></a></th>
<th scope="col" class="text">{$lang->member_group}</th>
<th scope="col">{$lang->status}</th>
<th scope="col">{$lang->cmd_view}</th>