rt 4.2.16

[freeside.git] / rt / share / html / SelfService / Elements / MyRequests

diff --git a/rt/share/html/SelfService/Elements/MyRequests b/rt/share/html/SelfService/Elements/MyRequests
index 549d458..91157b5 100755 (executable)
--- a/rt/share/html/SelfService/Elements/MyRequests
+++ b/rt/share/html/SelfService/Elements/MyRequests
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2019 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -45,42 +45,35 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-<&| /Widgets/TitleBox, title =>  $title &>
+<&| /Widgets/TitleBox, title => $title &>
 <& /Elements/CollectionList, Title   => $title,
-                        Format  => $Format, 
-                        Query   => $Query, 
-                        Order   => @Order, 
-                        OrderBy => @OrderBy,
-                        BaseURL => $BaseURL,
-                        GenericQueryArgs => $GenericQueryArgs,
-                        AllowSorting => $AllowSorting,
-                        Class   => 'RT::Tickets',
-             Rows    => $Rows,
-                        Page    => $Page &>
+  Format  => $Format,
+  Query   => $Query,
+  Order   => @Order,
+  OrderBy => @OrderBy,
+  BaseURL => $BaseURL,
+  AllowSorting => 1,
+  Class   => 'RT::Tickets',
+  Rows    => $Rows,
+  Page    => $Page &>
 </&>
 
 <%INIT>
+$title ||= loc("My [_1] tickets", $friendly_status);
 my $id = $session{'CurrentUser'}->id;
-my $Query = "( "
-    . join( ' OR ', map "$_.id = $id", @roles )
-    . ")";
+my $Query = "( Watcher.id = $id )";
 if ( @status ) {
-    $Query .= " AND ( "
-        . join( ' OR ', map "Status = '$_'", @status )
-        . " )";
+    @status = map {s/(['\\])/\\$1/g; "Status = '$_'"} @status;
+    $Query .= " AND ( " . join(' OR ', @status ) . " )";
 }
 my $Format = RT->Config->Get('DefaultSelfServiceSearchResultFormat');
-
 </%INIT>
 <%ARGS>
+$title => undef
 $friendly_status => loc('open')
-$title => loc("My [_1] tickets", $friendly_status)
-@roles => ('Watcher')
-@status => RT::Queue->ActiveStatusArray()
+@status => ()
 $BaseURL => undef
 $Page => 1
-$GenericQueryArgs => undef
-$AllowSorting => 1
 @Order => ('ASC')
 @OrderBy => ('Created')
 $Rows => 50