[Rt-commit] rt branch, 4.2/web-attachs-processing, created. rt-3.9.7-1226-g41c47e0
Ruslan Zakirov
ruz at bestpractical.com
Fri Jan 21 04:48:26 EST 2011
The branch, 4.2/web-attachs-processing has been created
at 41c47e09eedd22f046b8dc5c0cb45b166730cbff (commit)
- Log -----------------------------------------------------------------
commit 41c47e09eedd22f046b8dc5c0cb45b166730cbff
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Thu Jan 20 14:47:22 2011 +0300
add tokens to update/create actions to distinguish attachments
diff --git a/share/html/Search/Bulk.html b/share/html/Search/Bulk.html
index 282e1d1..c8ee552 100755
--- a/share/html/Search/Bulk.html
+++ b/share/html/Search/Bulk.html
@@ -228,10 +228,12 @@ map ( $ARGS{$_} =~ /^$/ && ( delete $ARGS{$_} ), keys %ARGS );
my (@results);
+$ARGS{'Token'} ||= $Token ||= Digest::MD5::md5_hex( rand(1024) );
+
# deal with deleting uploaded attachments
foreach my $key (keys %ARGS) {
if ($key =~ m/^DeleteAttach-(.+)$/) {
- delete $session{'Attachments'}{$1};
+ delete $session{'Attachments'}{ $Token }{ $1 };
}
$session{'Attachments'} = { %{$session{'Attachments'} || {}} };
}
@@ -243,15 +245,14 @@ if ($ARGS{'Attach'}) { # attachment?
);
my $file_path = Encode::decode_utf8("$ARGS{'Attach'}");
- $session{'Attachments'} = {
- %{$session{'Attachments'} || {}},
- $file_path => $attachment,
- };
+ # force session save
+ $session{'Attachments'} = $session{'Attachments'} || {};
+ $session{'Attachments'}{ $Token }{ $file_path } = $attachment;
}
# delete temporary storage entry to make WebUI clean
-unless (keys %{$session{'Attachments'}} and $ARGS{'UpdateAttach'}) {
- delete $session{'Attachments'};
+unless (keys %{$session{'Attachments'}{ $Token }} and $ARGS{'UpdateAttach'}) {
+ delete $session{'Attachments'}{ $Token };
}
$Page ||= 1;
@@ -310,7 +311,8 @@ my $cf_add_keys;
unless ( $ARGS{'AddMoreAttach'} ) {
# Add session attachments if any to be processed by ProcessUpdateMessage
- $ARGS{'UpdateAttachments'} = $session{'Attachments'} if ( $session{'Attachments'} );
+ $ARGS{'UpdateAttachments'} = $session{'Attachments'}{ $Token }
+ if $session{'Attachments'}{ $Token };
while ( my $Ticket = $Tickets->Next ) {
next unless ( $ARGS{ "UpdateTicket" . $Ticket->Id } );
@@ -416,7 +418,7 @@ unless ( $ARGS{'AddMoreAttach'} ) {
}
# Cleanup WebUI
- delete $session{'Attachments'};
+ delete $session{'Attachments'}{ $Token };
}
my $TxnCFs = RT::CustomFields->new( $session{CurrentUser} );
@@ -425,6 +427,7 @@ $TxnCFs->LimitToGlobalOrObjectId( sort keys %queues );
</%INIT>
<%args>
+$Token => undef
$Format => undef
$Page => 1
$Rows => undef
diff --git a/share/html/SelfService/Display.html b/share/html/SelfService/Display.html
index 5c3f396..3223aac 100755
--- a/share/html/SelfService/Display.html
+++ b/share/html/SelfService/Display.html
@@ -102,17 +102,14 @@ my $Ticket = RT::Ticket->new( $session{'CurrentUser'} );
# store the uploaded attachment in session
if ( $ARGS{'Attach'} ) { # attachment?
- $session{'Attachments'} = {} unless defined $session{'Attachments'};
-
my $attachment = MakeMIMEEntity(
AttachmentFieldName => 'Attach'
);
my $file_path = Encode::decode_utf8("$ARGS{'Attach'}");
- $session{'Attachments'} = {
- %{ $session{'Attachments'} || {} },
- $file_path => $attachment,
- };
+ # force session save
+ $session{'Attachments'} = $session{'Attachments'} || {};
+ $session{'Attachments'}{ $Token }{ $file_path } = $attachment;
}
if ( defined ($id[0]) && $id[0] eq 'new' ) {
@@ -134,7 +131,7 @@ if ( defined ($id[0]) && $id[0] eq 'new' ) {
( $Ticket, @results ) =
- CreateTicket( Attachments => $session{'Attachments'}, %ARGS, Status => 'new' );
+ CreateTicket( Attachments => $session{'Attachments'}{$Token}, %ARGS, Status => 'new' );
unless ( $Ticket->id ) {
$m->comp( 'Error.html', Why => join( "\n", @results ));
@@ -143,8 +140,8 @@ if ( defined ($id[0]) && $id[0] eq 'new' ) {
# delete temporary storage entry to make WebUI clean
- unless ( keys %{ $session{'Attachments'} } and $ARGS{'UpdateAttach'} ) {
- delete $session{'Attachments'};
+ unless ( keys %{ $session{'Attachments'}{ $Token } } and $ARGS{'UpdateAttach'} ) {
+ delete $session{'Attachments'}{ $Token };
}
}
@@ -159,24 +156,24 @@ if ( defined ($id[0]) && $id[0] eq 'new' ) {
if (
- $session{'Attachments'}
+ $session{'Attachments'}{ $Token }
|| ( defined $ARGS{'UpdateContent'}
&& $ARGS{'UpdateContent'} ne ''
&& $ARGS{'UpdateContent'} ne "-- \n"
. $session{'CurrentUser'}->UserObj->Signature )
)
{
- $ARGS{UpdateAttachments} = $session{'Attachments'};
+ $ARGS{UpdateAttachments} = $session{'Attachments'}{ $Token };
}
push @results, ProcessUpdateMessage(
ARGSRef => \%ARGS,
TicketObj => $Ticket
);
- delete $session{'Attachments'};
+ delete $session{'Attachments'}{ $Token };
# delete temporary storage entry to make WebUI clean
- unless ( keys %{ $session{'Attachments'} } and $ARGS{'UpdateAttach'} ) {
- delete $session{'Attachments'};
+ unless ( keys %{ $session{'Attachments'}{ $Token } } and $ARGS{'UpdateAttach'} ) {
+ delete $session{'Attachments'}{ $Token };
}
my @cfupdates = ProcessObjectCustomFieldUpdates(Object => $Ticket, ARGSRef => \%ARGS);
@@ -228,4 +225,5 @@ if ( defined ($id[0]) && $id[0] eq 'new' ) {
<%ARGS>
$id => undef
+$Token => ''
</%ARGS>
diff --git a/share/html/Ticket/Create.html b/share/html/Ticket/Create.html
index 9529865..24c7561 100755
--- a/share/html/Ticket/Create.html
+++ b/share/html/Ticket/Create.html
@@ -54,6 +54,7 @@
<form action="<% RT->Config->Get('WebPath') %>/Ticket/Create.html" method="post" enctype="multipart/form-data" name="TicketCreate">
<input type="hidden" class="hidden" name="id" value="new" />
+ <input type="hidden" class="hidden" name="Token" value="<% $Token %>" />
% $m->callback( CallbackName => 'FormStart', QueueObj => $QueueObj, ARGSRef => \%ARGS );
@@ -372,10 +373,12 @@ my $ValidCFs = $m->comp(
ARGSRef => \%ARGS
);
+$ARGS{'Token'} ||= $Token ||= Digest::MD5::md5_hex( rand(1024) );
+
# deal with deleting uploaded attachments
foreach my $key (keys %ARGS) {
if ($key =~ m/^DeleteAttach-(.+)$/) {
- delete $session{'Attachments'}{$1};
+ delete $session{'Attachments'}{ $Token }{$1};
}
$session{'Attachments'} = { %{$session{'Attachments'} || {}} };
}
@@ -387,15 +390,13 @@ if ($ARGS{'Attach'}) { # attachment?
);
my $file_path = Encode::decode_utf8("$ARGS{'Attach'}");
- $session{'Attachments'} = {
- %{$session{'Attachments'} || {}},
- $file_path => $attachment,
- };
+ $session{'Attachments'} = $session{'Attachments'} || {};
+ $session{'Attachments'}{ $Token }{ $file_path } = $attachment;
}
# delete temporary storage entry to make WebUI clean
-unless (keys %{$session{'Attachments'}} and $ARGS{'id'} eq 'new') {
- delete $session{'Attachments'};
+unless (keys %{$session{'Attachments'}{$Token}} and $ARGS{'id'} eq 'new') {
+ delete $session{'Attachments'}{$Token};
}
my $checks_failure = 0;
@@ -458,6 +459,7 @@ PageMenu->child( details => raw_html => q[<a href="#details" onclick="return sw
</%INIT>
<%ARGS>
+$Token => undef
$DependsOn => undef
$DependedOnBy => undef
$MemberOf => undef
diff --git a/share/html/Ticket/Display.html b/share/html/Ticket/Display.html
index c5305ee..9bc3ad0 100755
--- a/share/html/Ticket/Display.html
+++ b/share/html/Ticket/Display.html
@@ -125,7 +125,7 @@ if ($ARGS{'id'} eq 'new') {
}
($TicketObj, @Actions) = CreateTicket(
- Attachments => delete $session{'Attachments'},
+ Attachments => delete $session{'Attachments'}{ $ARGS{'Token'} || '' },
%ARGS,
);
unless ( $TicketObj->CurrentUserHasRight('ShowTicket') ) {
@@ -152,14 +152,13 @@ if ($ARGS{'id'} eq 'new') {
ARGSRef => \%ARGS,
Actions => \@Actions);
- $ARGS{UpdateAttachments} = $session{'Attachments'};
+ $ARGS{UpdateAttachments} = delete $session{'Attachments'}{ $ARGS{'Token'} || '' };
push @Actions,
ProcessUpdateMessage(
ARGSRef => \%ARGS,
Actions => \@Actions,
TicketObj => $TicketObj,
);
- delete $session{'Attachments'};
#Process status updates
push @Actions, ProcessTicketWatchers(ARGSRef => \%ARGS, TicketObj => $TicketObj );
diff --git a/share/html/Ticket/Elements/AddAttachments b/share/html/Ticket/Elements/AddAttachments
index 16fea6d..db4c659 100644
--- a/share/html/Ticket/Elements/AddAttachments
+++ b/share/html/Ticket/Elements/AddAttachments
@@ -45,11 +45,11 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-% if (exists $session{'Attachments'}) {
+% if ( $attachments ) {
<tr><td class="label"><&|/l&>Attached file</&>:</td>
<td>
<&|/l&>Check box to delete</&><br />
-% foreach my $attach_name (keys %{$session{'Attachments'}}) {
+% foreach my $attach_name ( keys %$attachments ) {
<input type="checkbox" class="checkbox" name="DeleteAttach-<%$attach_name%>" value="1" /><%$attach_name%><br />
% } # end of foreach
</td>
@@ -59,3 +59,12 @@
<tr><td class="label"><&|/l&>Attach</&>:</td><td><input name="Attach" type="file" /><input type="submit" class="button" name="AddMoreAttach" value="<&|/l&>Add More Files</&>" /><input type="hidden" class="hidden" name="UpdateAttach" value="1" />
</td></tr>
+<%ARGS>
+$Token => ''
+</%ARGS>
+<%INIT>
+my $attachments;
+if ( exists $session{'Attachments'}{ $Token } && keys %{ $session{'Attachments'}{ $Token } } ) {
+ $attachments = $session{'Attachments'}{ $Token };
+}
+</%INIT>
diff --git a/share/html/Ticket/ModifyAll.html b/share/html/Ticket/ModifyAll.html
index 8cad009..af703a4 100755
--- a/share/html/Ticket/ModifyAll.html
+++ b/share/html/Ticket/ModifyAll.html
@@ -152,10 +152,12 @@ $CanRespond = 1 if ( $Ticket->CurrentUserHasRight('ReplyToTicket') or
$CanComment = 1 if ( $Ticket->CurrentUserHasRight('CommentOnTicket') or
$Ticket->CurrentUserHasRight('ModifyTicket') );
+$ARGS{'Token'} ||= $Token ||= Digest::MD5::md5_hex( rand(1024) );
+
# deal with deleting uploaded attachments
foreach my $key (keys %ARGS) {
if ($key =~ m/^DeleteAttach-(.+)$/) {
- delete $session{'Attachments'}{$1};
+ delete $session{'Attachments'}{$Token}{$1};
}
$session{'Attachments'} = { %{$session{'Attachments'} || {}} };
}
@@ -167,15 +169,14 @@ if ($ARGS{'Attach'}) { # attachment?
);
my $file_path = Encode::decode_utf8("$ARGS{'Attach'}");
- $session{'Attachments'} = {
- %{$session{'Attachments'} || {}},
- $file_path => $attachment,
- };
+ # force session save
+ $session{'Attachments'} = $session{'Attachments'} || {};
+ $session{'Attachments'}{ $Token }{ $file_path } = $attachment;
}
# delete temporary storage entry to make WebUI clean
-unless (keys %{$session{'Attachments'}} and $ARGS{'UpdateAttach'}) {
- delete $session{'Attachments'};
+unless (keys %{$session{'Attachments'}{$Token}} and $ARGS{'UpdateAttach'}) {
+ delete $session{'Attachments'}{ $Token };
}
@@ -198,10 +199,11 @@ unless ($OnlySearchForPeople or $OnlySearchForGroup or $ARGS{'AddMoreAttach'} )
push @results, ProcessTicketDates( TicketObj => $Ticket, ARGSRef => \%ARGS);
# Add session attachments if any to be processed by ProcessUpdateMessage
- $ARGS{'UpdateAttachments'} = $session{'Attachments'} if ( $session{'Attachments'} );
+ $ARGS{'UpdateAttachments'} = $session{'Attachments'}{ $Token }
+ if $session{'Attachments'}{ $Token };
push @results, ProcessUpdateMessage( TicketObj => $Ticket, ARGSRef=>\%ARGS );
# Cleanup WebUI
- delete $session{'Attachments'};
+ delete $session{'Attachments'}{ $Token };
push @results, ProcessTicketBasics( TicketObj => $Ticket, ARGSRef => \%ARGS );
push @results, ProcessTicketLinks( TicketObj => $Ticket, ARGSRef => \%ARGS);
@@ -222,6 +224,7 @@ unless ($Ticket->CurrentUserHasRight('ShowTicket')) {
<%ARGS>
+$Token => undef
$OnlySearchForPeople => undef
$OnlySearchForGroup => undef
$UserField => undef
diff --git a/share/html/Ticket/Update.html b/share/html/Ticket/Update.html
index d67c9c2..ae49c11 100755
--- a/share/html/Ticket/Update.html
+++ b/share/html/Ticket/Update.html
@@ -57,6 +57,7 @@
<input type="hidden" class="hidden" name="QuoteTransaction" value="<% $ARGS{QuoteTransaction}||'' %>" />
<input type="hidden" class="hidden" name="DefaultStatus" value="<% $DefaultStatus ||''%>" />
<input type="hidden" class="hidden" name="Action" value="<% $ARGS{Action}||'' %>" />
+<input type="hidden" class="hidden" name="Token" value="<% $Token %>" />
<& /Elements/GnuPG/SignEncryptWidget:ShowIssues, self => $gnupg_widget &>
@@ -240,11 +241,12 @@ $CanRespond = 1 if ( $TicketObj->CurrentUserHasRight('ReplyToTicket') or
$CanComment = 1 if ( $TicketObj->CurrentUserHasRight('CommentOnTicket') or
$TicketObj->CurrentUserHasRight('ModifyTicket') );
+$ARGS{'Token'} ||= $Token ||= Digest::MD5::md5_hex( rand(1024) );
# deal with deleting uploaded attachments
foreach my $key (keys %ARGS) {
if ($key =~ m/^DeleteAttach-(.+)$/) {
- delete $session{'Attachments'}{$1};
+ delete $session{'Attachments'}{$Token}{$1};
}
$session{'Attachments'} = { %{$session{'Attachments'} || {}} };
}
@@ -256,15 +258,14 @@ if ($ARGS{'Attach'}) { # attachment?
);
my $file_path = Encode::decode_utf8("$ARGS{'Attach'}");
- $session{'Attachments'} = {
- %{$session{'Attachments'} || {}},
- $file_path => $attachment,
- };
+ # force session save
+ $session{'Attachments'} = $session{'Attachments'} || {};
+ $session{'Attachments'}{ $Token }{ $file_path } = $attachment;
}
# delete temporary storage entry to make WebUI clean
-unless (keys %{$session{'Attachments'}} and $ARGS{'UpdateAttach'}) {
- delete $session{'Attachments'};
+unless (keys %{$session{'Attachments'}{$Token}} and $ARGS{'UpdateAttach'}) {
+ delete $session{'Attachments'}{ $Token };
}
my $gnupg_widget = $m->comp('/Elements/GnuPG/SignEncryptWidget:new', Arguments => \%ARGS );
@@ -332,4 +333,5 @@ if ( !$checks_failure && !$skip_update && exists $ARGS{SubmitTicket} ) {
$id => undef
$Action => undef
$DefaultStatus => undef
+$Token => undef
</%ARGS>
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list