Merge /home/andrew/projects/davical/ into rscds

This commit is contained in:
Andrew McMillan 2007-10-01 20:35:17 +13:00
commit f460f49bf2

View File

@ -125,6 +125,11 @@ class RSCDSUser extends User
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 );
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' );
} }
@ -199,10 +204,10 @@ EOSQL;
$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'] ); $browser->AddOrder( $_GET['o'], $_GET['d'], 1 );
} }
else else
$browser->AddOrder( 'rt_name', 'A' ); $browser->AddOrder( 'rt_name', 'A', 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->DoQuery(); $browser->DoQuery();