X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FSearch%2FBulk.html;h=2416d95a19b893d2f7b49d7a3f91fba841e92fbe;hp=250f6135d3c9388a2069ebc9b6b615b9af0384bc;hb=187086c479a09629b7d180eec513fb7657f4e291;hpb=a6fe07e49e3fc12169e801b1ed6874c3a5bd8500 diff --git a/rt/share/html/Search/Bulk.html b/rt/share/html/Search/Bulk.html index 250f6135d..2416d95a1 100755 --- a/rt/share/html/Search/Bulk.html +++ b/rt/share/html/Search/Bulk.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2018 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -50,13 +50,13 @@ <& /Elements/ListActions, actions => \@results &>
-% foreach my $var (qw(Query Format OrderBy Order Rows Page SavedChartSearchId)) { +% foreach my $var (qw(Query Format OrderBy Order Rows Page SavedSearchId SavedChartSearchId Token)) { %} <& /Elements/CollectionList, Query => $Query, - DisplayFormat => $Format, - Format => $ARGS{'Format'}, + DisplayFormat => $DisplayFormat, + Format => $Format, Verbatim => 1, AllowSorting => 1, OrderBy => $OrderBy, @@ -71,7 +71,7 @@
-<& /Elements/Submit, Label => loc('Update'), CheckboxNameRegex => '/^UpdateTicket\d+$/', CheckAll => 1, ClearAll => 1 &> +<& /Elements/Submit, Label => loc('Update'), CheckboxNameRegex => '/^UpdateTicket(All)?$/', CheckAll => 1, ClearAll => 1 &>
<&|/Widgets/TitleBox, title => $title &> @@ -80,20 +80,20 @@
+ - + - + - + - + - + - +
<&|/l&>Make Owner: <& /Elements/SelectOwner, Name => "Owner", Default => $ARGS{Owner} || '' &> -( /> <&|/l&>Force change)
<&|/l&>Add Requestor:
<& /Elements/EmailInput, Name => "AddRequestor", Size=> 20, Default => $ARGS{AddRequestor} &>
<&|/l&>Remove Requestor:
<& /Elements/EmailInput, Name => "DeleteRequestor", Size=> 20, Default => $ARGS{DeleteRequestor} &>
<&|/l&>Add Cc:
<& /Elements/EmailInput, Name => "AddCc", Size=> 20, Default => $ARGS{AddCc} &>
<&|/l&>Remove Cc:
<& /Elements/EmailInput, Name => "DeleteCc", Size=> 20, Default => $ARGS{DeleteCc} &>
<&|/l&>Add AdminCc:
<& /Elements/EmailInput, Name => "AddAdminCc", Size=> 20, Default => $ARGS{AddAdminCc} &>
<&|/l&>Remove AdminCc:
<& /Elements/EmailInput, Name => "DeleteAdminCc", Size=> 20, Default => $ARGS{DeleteAdminCc} &>
@@ -111,17 +111,15 @@ <&|/l&>Make queue: <& /Elements/SelectQueue, Name => "Queue", Default => $ARGS{Queue} &> <&|/l&>Make Status: - <& /Elements/SelectStatus, Name => "Status", Default => $ARGS{Status} &> + <& /Ticket/Elements/SelectStatus, Name => "Status", Default => $ARGS{Status}, Queues => $seen_queues &> <&|/l&>Make date Starts: - <& /Elements/SelectDate, Name => "Starts_Date", ShowTime => 0, Default => $ARGS{Starts_Date} || '' &> + <& /Elements/SelectDate, Name => "Starts_Date", Default => $ARGS{Starts_Date} || '' &> <&|/l&>Make date Started: - <& /Elements/SelectDate, Name => "Started_Date", ShowTime => 0, Default => $ARGS{Started_Date} || '' &> + <& /Elements/SelectDate, Name => "Started_Date", Default => $ARGS{Started_Date} || '' &> <&|/l&>Make date Told: - <& /Elements/SelectDate, Name => "Told_Date", ShowTime => 0, Default => $ARGS{Tole_Date} || '' &> + <& /Elements/SelectDate, Name => "Told_Date", Default => $ARGS{Told_Date} || '' &> <&|/l&>Make date Due: - <& /Elements/SelectDate, Name => "Due_Date", ShowTime => 0, Default => $ARGS{Due_Date} || '' &> - <&|/l&>Make date Resolved: - <& /Elements/SelectDate, Name => "Resolved_Date", ShowTime => 0, Default => $ARGS{Resolved_Date} || '' &> + <& /Elements/SelectDate, Name => "Due_Date", Default => $ARGS{Due_Date} || '' &> @@ -131,28 +129,34 @@ <&| /Widgets/TitleBox, title => loc('Add comments or replies to selected tickets') &> - - + + + + +% $m->callback( CallbackName => 'BeforeTransactionCustomFields', CustomFields => $TxnCFs ); % while (my $CF = $TxnCFs->Next()) { - % } # end if while <& /Ticket/Elements/AddAttachments, %ARGS &> - + my $cfs = RT::CustomFields->new($session{'CurrentUser'}); $cfs->LimitToGlobal(); $cfs->LimitToQueue($_) for keys %$seen_queues; +$cfs->SetContextObject( values %$seen_queues ) if keys %$seen_queues == 1; -% if ($cfs->Count) { -<&|/Widgets/TitleBox, title => loc('Edit Custom Fields'), color => "#336633"&> -
<&|/l&>Update Type:
<&|/l&>Subject: " />
<&|/l&>Subject: + " /> +% $m->callback( %ARGS, CallbackName => 'AfterUpdateSubject' ); +
<% $CF->Name %>:<& /Elements/EditCustomField, - CustomField => $CF, - NamePrefix => "Object-RT::Transaction--CustomField-", - Default => $ARGS{"Object-RT::Transaction--CustomField-" . $CF->id . '-Values'} || - $ARGS{"Object-RT::Transaction--CustomField-" . $CF->id . '-Value'}, +<& /Elements/EditCustomField, + CustomField => $CF, + Object => RT::Transaction->new( $session{'CurrentUser'} ), &><% $CF->FriendlyType %>
<&|/l&>Message: +
<&|/l&>Message: +% $m->callback( %ARGS, CallbackName => 'BeforeMessageBox' ); %# Currently, bulk update always starts with Comment not Reply selected, so we check this unconditionally % my $IncludeSignature = RT->Config->Get('MessageBoxIncludeSignatureOnComment'); <& /Elements/MessageBox, Name => "UpdateContent", @@ -168,52 +172,22 @@ size="60" value="<% $ARGS{UpdateSubject} || "" %>" />
- - - - - -% while (my $cf = $cfs->Next()) { - - -% my $rows = 5; -% my $cf_id = $cf->id; -% my @add = (NamePrefix => 'Bulk-Add-CustomField-', CustomField => $cf, Rows => $rows, -% Multiple => ($cf->MaxValues ==1 ? 0 : 1) , Cols => 25, -% Default => $ARGS{"Bulk-Add-CustomField-$cf_id-Values"} || $ARGS{"Bulk-Add-CustomField-$cf_id-Value"}, ); -% my @del = (NamePrefix => 'Bulk-Delete-CustomField-', CustomField => $cf, -% Rows => $rows, Multiple => 1, Cols => 25, -% Default => $ARGS{"Bulk-Delete-CustomField-$cf_id-Values"} || $ARGS{"Bulk-Delete-CustomField-$cf_id-Value"}, ); -% if ($cf->Type eq 'Select') { - - -% } elsif ($cf->Type eq 'Combobox') { - - -% } elsif ($cf->Type eq 'Freeform') { - - -% } elsif ($cf->Type eq 'Text') { - - -% } else { -% $RT::Logger->crit("Unknown CustomField type: " . $cf->Type); -% } - -% } -
<&|/l&>Name<&|/l&>Add values<&|/l&>Delete values
<% loc($cf->Name) %>
-(<%$cf->FriendlyType%>)		<& /Elements/EditCustomFieldSelect, @add &><& /Elements/EditCustomFieldSelect, @del &><& /Elements/EditCustomFieldCombobox, @add &><& /Elements/EditCustomFieldCombobox, @del &><& /Elements/EditCustomFieldFreeform, @add &><& /Elements/EditCustomFieldFreeform, @del &><& /Elements/EditCustomFieldText, @add &> 
+% if ( $cfs->Count ) { +<&|/Widgets/TitleBox, title => loc('Edit Custom Fields') &> +<& /Elements/BulkCustomFields, $ARGS{'AddMoreAttach'} ? %ARGS : (), CustomFields => $cfs &> % } <&|/Widgets/TitleBox, title => loc('Edit Links'), color => "#336633"&> <&|/l&>Enter tickets or URIs to link tickets to. Separate multiple entries with spaces.
-<& /Ticket/Elements/BulkLinks, Tickets => $Tickets, $ARGS{'AddMoreAttach'} ? %ARGS : () &> +<& /Elements/BulkLinks, Collection => $Tickets, $ARGS{'AddMoreAttach'} ? %ARGS : () &> + + +<&| /Widgets/TitleBox, title => loc('Merge'), color => '#336633' &> +<& /Ticket/Elements/EditMerge, Tickets => $Tickets, %ARGS &> <& /Elements/Submit, Label => loc('Update') &> @@ -229,43 +203,29 @@ unless ( defined $Rows ) { } my $title = loc("Update multiple tickets"); +#freeside +unless ( $session{'CurrentUser'} + ->HasRight( Right => 'BulkUpdateTickets', Object => RT->System) ) +{ + Abort('You are not allowed to bulk-update tickets.'); +} + # Iterate through the ARGS hash and remove anything with a null value. map ( $ARGS{$_} =~ /^$/ && ( delete $ARGS{$_} ), keys %ARGS ); my (@results); -# deal with deleting uploaded attachments -foreach my $key (keys %ARGS) { - if ($key =~ m/^DeleteAttach-(.+)$/) { - delete $session{'Attachments'}{$1}; - } - $session{'Attachments'} = { %{$session{'Attachments'} || {}} }; -} - -# store the uploaded attachment in session -if ( defined $ARGS{'Attach'} && length $ARGS{'Attach'} ) { # attachment? - my $attachment = MakeMIMEEntity( - AttachmentFieldName => 'Attach' - ); - - my $file_path = Encode::decode_utf8("$ARGS{'Attach'}"); - $session{'Attachments'} = { - %{$session{'Attachments'} || {}}, - $file_path => $attachment, - }; -} - -# delete temporary storage entry to make WebUI clean -unless (keys %{$session{'Attachments'}} and $ARGS{'UpdateAttach'}) { - delete $session{'Attachments'}; -} +ProcessAttachments(ARGSRef => \%ARGS); $Page ||= 1; $Format ||= RT->Config->Get('DefaultSearchResultFormat'); # inject _CHECKBOX to the first field. -$Format =~ s/'?([^']+)'?,/'___CHECKBOX__$1',/; #' +my $DisplayFormat = "'__CheckBox.{UpdateTicket}__',". $Format; +$DisplayFormat =~ s/\s*,\s*('?__NEWLINE__'?)/,$1,''/gi; + +$DECODED_ARGS->{'UpdateTicketAll'} = 1 unless @UpdateTicket; my $Tickets = RT::Tickets->new( $session{'CurrentUser'} ); $Tickets->FromSQL($Query); @@ -293,7 +253,8 @@ Abort( loc("No search to operate on.") ) unless ($Tickets); my $fields = {}; my $seen_queues = {}; while ( my $ticket = $Tickets->Next ) { - next if $seen_queues->{ $ticket->Queue }++; + next if $seen_queues->{ $ticket->Queue }; + $seen_queues->{ $ticket->Queue } ||= $ticket->QueueObj; my $custom_fields = $ticket->CustomFields; while ( my $field = $custom_fields->Next ) { @@ -303,17 +264,9 @@ while ( my $ticket = $Tickets->Next ) { #Iterate through each ticket we've been handed my @linkresults; -my %queues; $Tickets->RedoSearch(); -# pull out the labels for any custom fields we want to update - -my $cf_del_keys; -@$cf_del_keys = grep { /^Bulk-Delete-CustomField/ } keys %ARGS; -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 @@ -322,20 +275,19 @@ if ( defined($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'} ); while ( my $Ticket = $Tickets->Next ) { - next unless ( $ARGS{ "UpdateTicket" . $Ticket->Id } ); + my $tid = $Ticket->id; + next unless grep $tid == $_, @UpdateTicket; #Update the links $ARGS{'id'} = $Ticket->id; - $queues{ $Ticket->QueueObj->Id }++; my @updateresults = ProcessUpdateMessage( - TicketObj => $Ticket, - ARGSRef => \%ARGS, - ); + TicketObj => $Ticket, + ARGSRef => \%ARGS, + KeepAttachments => 1, + ); #Update the basics. my @basicresults = @@ -347,76 +299,11 @@ unless ( $ARGS{'AddMoreAttach'} ) { my @watchresults = ProcessTicketWatchers( TicketObj => $Ticket, ARGSRef => \%ARGS ); - 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)) { - delete $ARGS{ $type . "-" . $Ticket->id }; - delete $ARGS{ $Ticket->id . "-" . $type }; - } - - my @cfresults; - - foreach my $list ( $cf_add_keys, $cf_del_keys ) { - next unless $list->[0]; - - - my $op; - if ( $list->[0] =~ /Add/ ) { - $op = 'add'; - - } - elsif ( $list->[0] =~ /Del/ ) { - $op = 'del'; - } - else { - $RT::Logger->crit( - "Got an op that was neither add nor delete. can never happen" - . $list->[0] ); - last; - } - - foreach my $key (@$list) { - my ( $cfid, $cf ); - next if $key =~ /CustomField-(\d+)-Category$/; - if ( $key =~ /CustomField-(\d+)-/ ) { - $cfid = $1; - $cf = RT::CustomField->new( $session{'CurrentUser'} ); - $cf->Load($cfid); - } - else {next} - my @values = - ref( $ARGS{$key} ) eq 'ARRAY' - ? @{ $ARGS{$key} } - : ( $ARGS{$key} ); - map { s/(\r\n|\r)/\n/g; } @values; # fix the newlines - # now break the multiline values into multivalues - @values = map { split( /\n/, $_ ) } @values - unless ( $cf->SingleValue ); - - my $current_values = $Ticket->CustomFieldValues($cfid); - foreach my $value (@values) { - if ( $op eq 'del' && $current_values->HasEntry($value) ) { - my ( $id, $msg ) = $Ticket->DeleteCustomFieldValue( - Field => $cfid, - Value => $value - ); - push @cfresults, $msg; - } - - elsif ( $op eq 'add' && !$current_values->HasEntry($value) ) { - my ( $id, $msg ) = $Ticket->AddCustomFieldValue( - Field => $cfid, - Value => $value - ); - push @cfresults, $msg; - } - } - } - } + @linkresults = + ProcessTicketLinks( TicketObj => $Ticket, TicketId => 'Ticket', ARGSRef => \%ARGS ); + + my @cfresults = ProcessRecordBulkCustomFields( RecordObj => $Ticket, ARGSRef => \%ARGS ); + my @statusresults = ProcessTicketStatus( TicketObj => $Ticket, ARGSRef => \%ARGS ); @@ -435,13 +322,15 @@ unless ( $ARGS{'AddMoreAttach'} ) { @results = ( @results, @tempresults ); } - # Cleanup WebUI - delete $session{'Attachments'}; + delete $session{'Attachments'}{ $ARGS{'Token'} }; + + $Tickets->RedoSearch(); } my $TxnCFs = RT::CustomFields->new( $session{CurrentUser} ); $TxnCFs->LimitToLookupType( RT::Transaction->CustomFieldLookupType ); -$TxnCFs->LimitToGlobalOrObjectId( sort keys %queues ); +$TxnCFs->LimitToGlobalOrObjectId( keys %$seen_queues ); +$TxnCFs->SetContextObject( values %$seen_queues ) if keys %$seen_queues == 1; <%args> @@ -452,6 +341,5 @@ $RowsPerPage => undef $Order => 'ASC' $OrderBy => 'id' $Query => undef -$SavedSearchId => undef -$SavedChartSearchId => undef +@UpdateTicket => ()