X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FSearch%2FBulk.html;h=9fbbc47902edf633ed388b4c8695004c439a455f;hb=679854b8bbc65d112071111bbd7f34a6a481fb30;hp=250f6135d3c9388a2069ebc9b6b615b9af0384bc;hpb=9b328d940af56b9924a342192ebb0790478fa705;p=freeside.git diff --git a/rt/share/html/Search/Bulk.html b/rt/share/html/Search/Bulk.html index 250f6135d..9fbbc4790 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-2013 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -111,17 +111,17 @@ <&|/l&>Make queue: <& /Elements/SelectQueue, Name => "Queue", Default => $ARGS{Queue} &> <&|/l&>Make Status: - <& /Elements/SelectStatus, Name => "Status", Default => $ARGS{Status} &> + <& /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} || '' &> + <& /Elements/SelectDate, Name => "Due_Date", Default => $ARGS{Due_Date} || '' &> <&|/l&>Make date Resolved: - <& /Elements/SelectDate, Name => "Resolved_Date", ShowTime => 0, Default => $ARGS{Resolved_Date} || '' &> + <& /Elements/SelectDate, Name => "Resolved_Date", Default => $ARGS{Resolved_Date} || '' &> @@ -234,31 +234,7 @@ 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;