diff options
Diffstat (limited to 'rt/share/html/Search/Bulk.html')
| -rwxr-xr-x | rt/share/html/Search/Bulk.html | 36 |
1 files changed, 28 insertions, 8 deletions
diff --git a/rt/share/html/Search/Bulk.html b/rt/share/html/Search/Bulk.html index 74487cdd6..4a510ce97 100755 --- a/rt/share/html/Search/Bulk.html +++ b/rt/share/html/Search/Bulk.html @@ -60,7 +60,7 @@ <& /Elements/ListActions, actions => \@results &> <form method="post" action="<% RT->Config->Get('WebPath') %>/Search/Bulk.html" enctype="multipart/form-data"> -% foreach my $var (qw(Query Format OrderBy Order Rows Page SavedChartSearchId)) { +% foreach my $var qw(Query Format OrderBy Order Rows Page SavedChartSearchId) { <input type="hidden" class="hidden" name="<%$var%>" value="<%$ARGS{$var} || ''%>" /> %} <& /Elements/CollectionList, @@ -111,7 +111,13 @@ <tr><td class="label"> <&|/l&>Make subject</&>: </td> <td class="value"> <input name="Subject" size="20" value="<% $ARGS{Subject} || '' %>"/> </td></tr> <tr><td class="label"> <&|/l&>Make priority</&>: </td> -<td class="value"> <& /Elements/SelectPriority, Name => "Priority", Default => $ARGS{Priority} &> </td></tr> +% my $rel = ($ARGS{Priority} =~ s/^R//); +<td class="value"> <& /Elements/SelectPriority, Name => "Priority", Default => $ARGS{Priority} &> +<select name="Priority-Mode"> +<option value="absolute" <% !$rel && 'selected' %>>absolute</option> +<option value="relative" <% $rel && 'selected' %>>relative</option> +</select> +</td></tr> <tr><td class="label"> <&|/l&>Make queue</&>: </td> <td class="value"> <& /Elements/SelectQueue, Name => "Queue", Default => $ARGS{Queue} &> </td></tr> <tr><td class="label"> <&|/l&>Make Status</&>: </td> @@ -283,7 +289,7 @@ $Page ||= 1; $Format ||= RT->Config->Get('DefaultSearchResultFormat'); # inject _CHECKBOX to the first field. -$Format =~ s/'?([^']+)'?,/'___CHECKBOX__$1',/; +$Format =~ s/'?([^']+)'?,/'___CHECKBOX__$1',/; #' my $Tickets = RT::Tickets->new( $session{'CurrentUser'} ); $Tickets->FromSQL($Query); @@ -332,6 +338,13 @@ my $cf_del_keys; my $cf_add_keys; @$cf_add_keys = grep { /^Bulk-Add-CustomField/ } keys %ARGS; +if ( defined($ARGS{'Priority'}) + and ($ARGS{'Priority-Mode'} || '') eq 'relative' ) { + # magic in Ticket::SetPriority + $ARGS{'Priority'} = 'R'.$ARGS{'Priority'}; +} +delete $ARGS{'Priority-Mode'}; + unless ( $ARGS{'AddMoreAttach'} ) { # Add session attachments if any to be processed by ProcessUpdateMessage $ARGS{'UpdateAttachments'} = $session{'Attachments'} if ( $session{'Attachments'} ); @@ -358,13 +371,13 @@ unless ( $ARGS{'AddMoreAttach'} ) { my @watchresults = ProcessTicketWatchers( TicketObj => $Ticket, ARGSRef => \%ARGS ); - foreach my $type (qw(MergeInto DependsOn MemberOf RefersTo)) { + foreach my $type qw(MergeInto DependsOn MemberOf RefersTo) { $ARGS{ $Ticket->id . "-" . $type } = $ARGS{"Ticket-$type"}; $ARGS{ $type . "-" . $Ticket->id } = $ARGS{"$type-Ticket"}; } @linkresults = ProcessTicketLinks( TicketObj => $Ticket, ARGSRef => \%ARGS ); - foreach my $type (qw(MergeInto DependsOn MemberOf RefersTo)) { + foreach my $type qw(MergeInto DependsOn MemberOf RefersTo) { delete $ARGS{ $type . "-" . $Ticket->id }; delete $ARGS{ $Ticket->id . "-" . $type }; } @@ -428,13 +441,20 @@ unless ( $ARGS{'AddMoreAttach'} ) { } } } - my @tempresults = ( + my @statusresults = + ProcessTicketStatus( TicketObj => $Ticket, ARGSRef => \%ARGS ); + + my @tempresults = ( @watchresults, @basicresults, @dateresults, - @updateresults, @linkresults, @cfresults + @updateresults, @linkresults, @cfresults, + @statusresults ); @tempresults = - map { loc( "Ticket [_1]: [_2]", $Ticket->Id, $_ ) } @tempresults; + map { + $_ =~ /^Ticket \d+:/ ? $_ : + loc( "Ticket [_1]: [_2]", $Ticket->Id, $_ ) + } @tempresults; @results = ( @results, @tempresults ); } |