1 files changed, 19 insertions, 52 deletions
diff --git a/rt/html/Search/Elements/DisplayOptions b/rt/html/Search/Elements/DisplayOptions
index 4bed090..43a9d99 100644
--- a/rt/html/Search/Elements/DisplayOptions
+++ b/rt/html/Search/Elements/DisplayOptions
@@ -2,7 +2,7 @@
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -22,9 +22,7 @@
 %# 
 %# You should have received a copy of the GNU General Public License
 %# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-%# 02110-1301 or visit their web page on the internet at
-%# http://www.gnu.org/copyleft/gpl.html.
+%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 %# 
 %# 
 %# CONTRIBUTION SUBMISSION POLICY:
@@ -45,53 +43,43 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-<&| /Widgets/TitleBox, title => loc("Display Columns") &>
+<& /Elements/TitleBoxStart, title => loc("Display Columns") &>
 <table>
 <tr>
 <td>
 <& EditFormat, %ARGS &>
 </td>
-<td valign="top">
-<table valign="top">
-
-% for my $o (0..3) {
+<td valign=top>
+<table valign=top>
 <tr>
-<td class="label">
-% if ($o == 0) {
+<td class=label>
 <&|/l&>Order by</&>:
-% }
-</td>
-<td class="value">
+</td><td class=value>
 <select name="OrderBy">
-% if ($o > 0) {
-<option value="">[none]</option>
-% }
-% foreach my $field (sort keys %fields) {
+% foreach my $field (keys %fields) {
 %    next unless $field;
-<option value="<%$field%>"
-% if (defined $OrderBy[$o] and $field eq $OrderBy[$o]) {
-selected
+<option value=<%$field%>
+% if ($field =~ /^$OrderBy$/i) {
+SELECTED
 % }
 ><&|/l&><%$field%></&></option>
 % }
 </select>
 <select name="Order">
 <option value="ASC"
-% unless ( ($Order[$o]||'') eq "DESC" ) {
-selected
+% if ($Order eq "ASC") {
+SELECTED
 % }
-><&|/l&>Asc</&></option>
+><&|/l&>Ascending</&></option>
 <option value="DESC"
-% if ( ($Order[$o]||'') eq "DESC" ) {
-selected
+% if ($Order eq "DESC") {
+SELECTED
 % }
-><&|/l&>Desc</&></option>
+><&|/l&>Descending</&></option>
 </select>
 </td>
 </tr>
-% }
-<tr>
-<td class="label">
+<td class=label>
 <&|/l&>Rows per page</&>:
 </td><td class="value">
 <& /Elements/SelectResultsPerPage, 
@@ -103,34 +91,14 @@ selected
 </td>
 </tr>
 </table>
-</&>
+<& /Elements/TitleBoxEnd &>
 
 <%INIT>
 my $tickets = new RT::Tickets($session{'CurrentUser'});
 my %fields = %{$tickets->FIELDS};
 map { $fields{$_}->[0] =~ /^(?:ENUM|INT|DATE|STRING)$/ || delete $fields{$_} } keys %fields;
 delete $fields{'EffectiveId'};
-$fields{ $_ . '.EmailAddress' } = 1 foreach( qw(Requestor Cc AdminCc) );
-
-# Add all available CustomFields to the list of sortable columns.
-my @cfs = grep /^CustomField/, @{$ARGS{AvailableColumns}};
-$fields{$_}=1 for @cfs;
-
-# Add PAW sort
-$fields{'Custom.Ownership'} = 1;
 
-my @Order;
-my @OrderBy;
-if ($OrderBy =~ /\|/) {
-    @OrderBy = split /\|/, $OrderBy;
-} else {
-    @OrderBy = ( $OrderBy );
-}
-if ($Order =~ /\|/) {
-    @Order = split /\|/, $Order;
-} else {
-    @Order = ( $Order );
-}
 
 </%INIT>
 
@@ -139,5 +107,4 @@ $Order => undef
 $OrderBy => undef
 $RowsPerPage => undef
 $Format => undef
-$GroupBy => 'id'
 </%ARGS>