nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-26 02:44:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix the somewhat confused calls to Browse::AddOrder

Browse Source
This commit is contained in:
Andrew McMillan 2008-11-10 17:36:10 +13:00
parent a99ed3f258
commit 9ed3461805
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
inc/RSCDSUser.php
View File

@ -119,14 +119,12 @@ class RSCDSUser extends User
if ( isset( $_GET['o']) && isset($_GET['d']) ) { if ( isset( $_GET['o']) && isset($_GET['d']) ) {
$browser->AddOrder( $_GET['o'], $_GET['d'] ); $browser->AddOrder( $_GET['o'], $_GET['d'] );
if ( $_GET['o'][0] != 'fullname' ) $browser->AddOrder( 'fullname', 'A', 0, 1 );
} }
else else {
$browser->AddOrder( 'rt_name', 'A' ); $browser->AddOrder( 'rt_name', 'A' );
# We always want a secondary sort on fullname.
if ( ! isset( $_GET['o'] ) ||
( isset( $_GET['o'] ) && $_GET['o'][0] != 'fullname' ) )
$browser->AddOrder( 'fullname', 'A', 0, 1 ); $browser->AddOrder( 'fullname', 'A', 0, 1 );
}
if ( $c->enable_row_linking ) { if ( $c->enable_row_linking ) {
$browser->RowFormat( "<tr onMouseover=\"LinkHref(this,1);\" title=\"".translate("Click to display that user")."\" class=\"r%d\">\n", "</tr>\n", '#even' ); $browser->RowFormat( "<tr onMouseover=\"LinkHref(this,1);\" title=\"".translate("Click to display that user")."\" class=\"r%d\">\n", "</tr>\n", '#even' );
@ -170,10 +168,14 @@ class RSCDSUser extends User
$browser->SetWhere( "to_user = $this->user_no" ); $browser->SetWhere( "to_user = $this->user_no" );
if ( isset( $_GET['o']) && isset($_GET['d']) ) { if ( isset( $_GET['o']) && isset($_GET['d']) ) {
$browser->AddOrder( $_GET['o'], $_GET['d'], 1 ); $browser->AddOrder( $_GET['o'], $_GET['d'] );
if ( $_GET['o'][0] != 'fullname' ) $browser->AddOrder( 'fullname', 'A', 0, 1 );
} }
else else {
$browser->AddOrder( 'rt_name', 'A', 1 ); $browser->AddOrder( 'rt_name', 'A', 1 );
$browser->AddOrder( 'fullname', 'A', 0, 1 );
}
$browser->RowFormat( "<tr onMouseover=\"LinkHref(this,1);\" title=\"".translate("Click to display that user")."\" class=\"r%d\">\n", "</tr>\n", '#even' ); $browser->RowFormat( "<tr onMouseover=\"LinkHref(this,1);\" title=\"".translate("Click to display that user")."\" class=\"r%d\">\n", "</tr>\n", '#even' );
$browser->SetTranslatable( array('rt_name') ); $browser->SetTranslatable( array('rt_name') );