[Rt-commit] rt branch, 5.0/only-use-personal-search-display-cols-for-tickets, created. rt-5.0.0-218-gb5ddcffa58

[Dianne Skoll]

The branch, 5.0/only-use-personal-search-display-cols-for-tickets has been created
        at  b5ddcffa5894efe2d375d612d0b081e504e43184 (commit)

- Log -----------------------------------------------------------------
commit b5ddcffa5894efe2d375d612d0b081e504e43184
Author: Dianne Skoll <dianne at bestpractical.com>
Date:   Mon Jan 11 16:44:07 2021 -0500

    Only use user-preferred display columns for Ticket searches, not for any other kind of search.

diff --git a/share/html/Search/Build.html b/share/html/Search/Build.html
index 41791c6f3f..f3d2015045 100644
--- a/share/html/Search/Build.html
+++ b/share/html/Search/Build.html
@@ -202,12 +202,21 @@ if ( $NewQuery ) {
         RowsPerPage => 50
     };
 
-    for( qw(Query Format OrderBy Order RowsPerPage ObjectType) ) {
+    for( qw(Query OrderBy Order RowsPerPage ObjectType) ) {
         $query{$_} = $current->{$_} unless defined $query{$_};
         $query{$_} = $prefs->{$_} unless defined $query{$_};
         $query{$_} = $default->{$_} unless defined $query{$_};
     }
 
+    # Only use $prefs->{Format} for Ticket searches
+    if ( $Class eq 'RT::Tickets' ) {
+        $query{Format} = $current->{Format} unless defined $query{Format};
+        $query{Format} = $prefs->{Format} unless defined $query{Format};
+        $query{Format} = $default->{Format} unless defined $query{Format};
+    } else {
+        $query{Format} = $current->{Format} unless defined $query{Format};
+        $query{Format} = $default->{Format} unless defined $query{Format};
+    }
     for( qw(Order OrderBy) ) {
         if (ref $query{$_} eq "ARRAY") {
             $query{$_} = join( '|', @{ $query{$_} } );

-----------------------------------------------------------------------