diff options
Diffstat (limited to 'rt/html/Search')
| -rw-r--r-- | rt/html/Search/Bulk.html | 13 | ||||
| -rw-r--r-- | rt/html/Search/Elements/PickRestriction | 4 | ||||
| -rw-r--r-- | rt/html/Search/Listing.html | 13 |
3 files changed, 16 insertions, 14 deletions
diff --git a/rt/html/Search/Bulk.html b/rt/html/Search/Bulk.html index de9143c8a..9ecac494f 100644 --- a/rt/html/Search/Bulk.html +++ b/rt/html/Search/Bulk.html @@ -145,7 +145,7 @@ while (my $Ticket = $session{'tickets'}->Next) { <& /Ticket/Elements/BulkLinks &> <& /Elements/TitleBoxEnd &> -<& /Elements/Submit &> +<& /Elements/Submit, Label => loc('Update All') &> </FORM> @@ -180,6 +180,11 @@ while (my $Ticket = $session{'tickets'}->Next) { $RT::Logger->debug( "Checking Ticket ".$Ticket->Id ."\n"); next unless ($ARGS{"UpdateTicket".$Ticket->Id}); $RT::Logger->debug ("Matched\n"); + my @updateresults; + if ($do_comment_reply) { + ProcessUpdateMessage(TicketObj => $Ticket, ARGSRef => \%ARGS, Actions => \@updateresults); + } + #Update the basics. my @basicresults = ProcessTicketBasics(TicketObj => $Ticket, ARGSRef => \%ARGS); my @dateresults = ProcessTicketDates(TicketObj => $Ticket, ARGSRef => \%ARGS); @@ -205,11 +210,7 @@ while (my $Ticket = $session{'tickets'}->Next) { delete $ARGS{$Ticket->Id.'-RefersTo'}; delete $ARGS{'RefersTo-'.$Ticket->Id}; - my @updateresults; - if ($do_comment_reply) { - ProcessUpdateMessage(TicketObj => $Ticket, ARGSRef => \%ARGS, Actions => \@updateresults); - } - my @tempresults = (@watchresults, @basicresults, @dateresults, @updateresults, @linkresults); + my @tempresults = (@watchresults, @basicresults, @dateresults, @updateresults, @linkresults); @tempresults = map { loc("Ticket [_1]: [_2]",$Ticket->Id,$_) } @tempresults; @results = (@results, @tempresults); diff --git a/rt/html/Search/Elements/PickRestriction b/rt/html/Search/Elements/PickRestriction index 0021ab2bc..ff9b86ba5 100644 --- a/rt/html/Search/Elements/PickRestriction +++ b/rt/html/Search/Elements/PickRestriction @@ -21,8 +21,8 @@ %# %# %# END LICENSE BLOCK -<FORM ACTION="Listing.html" METHOD="GET"> -<INPUT TYPE=HIDDEN NAME="Bookmark" VALUE="<% $session{'tickets'}->FreezeLimits()|u %>"> +<FORM ACTION="<%$RT::WebPath%>/Search/Listing.html" METHOD="GET"> +<INPUT TYPE=HIDDEN NAME="Bookmark" VALUE="<% $session{'tickets'}->FreezeLimits()%>"> <& /Elements/TitleBoxStart, title => loc('Refine search')&> <INPUT TYPE=HIDDEN NAME="CompileRestriction" VALUE=1> diff --git a/rt/html/Search/Listing.html b/rt/html/Search/Listing.html index 508534549..68b1fd75c 100644 --- a/rt/html/Search/Listing.html +++ b/rt/html/Search/Listing.html @@ -37,16 +37,16 @@ </TABLE> <div align=center> <font size=2> -<a href="Listing.html?GotoPage=1"><&|/l&>First page</&></a> +<a href="<%$RT::WebPath%>/Search/Listing.html?GotoPage=1"><&|/l&>First page</&></a> % if ( $session{'tickets'}->FirstRow >= $session{'tickets_rows_per_page'}-1 ) { -<a href="Listing.html?GotoPage=Prev"><<&|/l&>Previous page</&></a> +<a href="<%$RT::WebPath%>/Search/Listing.html?GotoPage=Prev"><<&|/l&>Previous page</&></a> % } % if ( $session{'tickets'}->FirstRow + $session{'tickets_rows_per_page'} < $ticketcount ) { -<a href="Listing.html?GotoPage=Next"><&|/l&>Next page</&>></a> +<a href="<%$RT::WebPath%>/Search/Listing.html?GotoPage=Next"><&|/l&>Next page</&>></a> % } -%# <form method=get action="Listing.html"><&|/l&>Goto page</&> <input name=GotoPage size=2></form> +%# <form method=get action="<%$RT::WebPath%>/Search/Listing.html"><&|/l&>Goto page</&> <input name=GotoPage size=2></form> </font> </div> <!--<div align=right>--> @@ -57,7 +57,7 @@ </td> <td align=right> -<a href="Bulk.html"><&|/l&>Update all these tickets at once</&></a> +<a href="<%$RT::WebPath%>/Search/Bulk.html"><&|/l&>Update all these tickets at once</&></a> <!--</div>--> </td> </tr> @@ -75,7 +75,7 @@ %} <BR> <BR> -<A HREF="<% $RT::WebPath%>/Search/Listing.html?Bookmark=<%$session{'tickets'}->FreezeLimits()|u%>&TicketsSortBy=<%$session{'tickets_sort_by'}%>&TicketsSortOrder=<%$session{'tickets_sort_order'}%>&RowsPerPage=<%$session{'tickets_rows_per_page'}%>"><&|/l&>Bookmarkable URL for this search</&></a> +<A HREF="<% $RT::WebPath%>/Search/Listing.html?Bookmark=<%$session{'tickets'}->FreezeLimits()|nu%>&TicketsSortBy=<%$session{'tickets_sort_by'}%>&TicketsSortOrder=<%$session{'tickets_sort_order'}%>&RowsPerPage=<%$session{'tickets_rows_per_page'}%>"><&|/l&>Bookmarkable URL for this search</&></a> <& /Elements/TitleBoxEnd&> </TD> <TD> @@ -96,6 +96,7 @@ if ($session{'tickets'}) { } if ( ($ARGS{'ClearRestrictions'}) || ($ARGS{'NewSearch'}) ) { $session{'tickets'}->ClearRestrictions; + $session{'tickets'}->CleanSlate; } } ProcessSearchQuery(ARGS=>\%ARGS); |