[Rt-commit] r10715 - in rt/branches/3.999-DANGEROUS: html/Ticket lib/RT/ScripAction
ruz at bestpractical.com
ruz at bestpractical.com
Mon Feb 4 12:39:44 EST 2008
Author: ruz
Date: Mon Feb 4 12:39:43 2008
New Revision: 10715
Modified:
rt/branches/3.999-DANGEROUS/html/Ticket/Create.html
rt/branches/3.999-DANGEROUS/html/Ticket/Elements/PreviewScrips
rt/branches/3.999-DANGEROUS/html/Ticket/Elements/ShowTransaction
rt/branches/3.999-DANGEROUS/html/Ticket/Elements/Tabs
rt/branches/3.999-DANGEROUS/html/Ticket/Update.html
rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/Notify.pm
Log:
* more fixes for t/web/gnupg-outgoing.t
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Create.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Create.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Create.html Mon Feb 4 12:39:43 2008
@@ -91,7 +91,7 @@
<td class="labeltop">
<&|/l&>Cc</&>:
</td>
-<td class="value" colspan="3"><input name="Cc" size="40" value="<% $ARGS{Cc} || ''%>" /></td>
+<td class="value" colspan="3"><input name="cc" size="40" value="<% $ARGS{cc} || ''%>" /></td>
<td class="comment" colspan="2"><i><font size="-2">
<&|/l&>(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <strong>will</strong> receive future updates.)</&></font></i>
</td>
@@ -100,7 +100,7 @@
<td class="labeltop">
<&|/l&>Admin Cc</&>:
</td>
-<td class="value" colspan="3"><input name="AdminCc" size="40" value="<% $ARGS{AdminCc} || ''%>" /></td>
+<td class="value" colspan="3"><input name="admin_cc" size="40" value="<% $ARGS{admin_cc} || ''%>" /></td>
<td class="comment" colspan="2"><i><font size="-2">
<&|/l&>(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <strong>will</strong> receive future updates.)</&></font></i>
</td>
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Elements/PreviewScrips
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Elements/PreviewScrips (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Elements/PreviewScrips Mon Feb 4 12:39:43 2008
@@ -116,7 +116,7 @@
my $action;
-if (($ARGS{'UpdateType'} && $ARGS{'UpdateType'} eq 'response' ) || ($ARGS{'Action'} && $ARGS{'Action'} eq 'Respond' )) {
+if (($ARGS{'UpdateType'} && $ARGS{'UpdateType'} eq 'response' ) || ($ARGS{'action'} && $ARGS{'action'} eq 'respond' )) {
$action = 'correspond';
}
else {
@@ -151,7 +151,7 @@
<%INIT>
my $action;
if ( ( $ARGS{'UpdateType'} && $ARGS{'UpdateType'} eq 'response' )
- || ( $ARGS{'Action'} && $ARGS{'Action'} eq 'Respond' ) )
+ || ( $ARGS{'action'} && $ARGS{'action'} eq 'respond' ) )
{
$action = 'correspond';
}
@@ -169,7 +169,7 @@
bcc_message_to => $ARGS{'UpdateBcc'},
mime_obj => $Message,
time_taken => $ARGS{'UpdateTimeWorked'},
- DryRun => 1
+ dry_run => 1
);
unless ( $id && $txn ) {
Jifty->log->error("Couldn't fire '$action' action: $msg");
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Elements/ShowTransaction
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Elements/ShowTransaction (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Elements/ShowTransaction Mon Feb 4 12:39:43 2008
@@ -190,7 +190,7 @@
"[<a href=\"".$UpdatePath
. "?id=" . $Transaction->ticket
. "&QuoteTransaction=" . $Transaction->id
- . "&Action=Respond\">"
+ . "&action=respond\">"
. _('Reply')
. "</a>] ";
}
@@ -200,7 +200,7 @@
. $Transaction->ticket
. "&QuoteTransaction="
. $Transaction->id
- . "&Action=comment\">"
+ . "&action=comment\">"
. _('comment') . "</a>]";
}
if ( $ticket->current_user_has_right('ForwardMessage') ) {
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Elements/Tabs
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Elements/Tabs (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Elements/Tabs Mon Feb 4 12:39:43 2008
@@ -147,7 +147,7 @@
if ( $can{'ModifyTicket'} or $Ticket->current_user_has_right('ReplyToTicket') ) {
$actions->{'F'} = {
title => _('Reply'),
- path => "Ticket/Update.html?action=Respond&id=" . $id,
+ path => "Ticket/Update.html?action=respond&id=" . $id,
};
}
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Update.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Update.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Update.html Mon Feb 4 12:39:43 2008
@@ -58,7 +58,7 @@
% $m->callback( Callbackname => 'FormStart', args_ref => \%ARGS );
<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="action" value="<% $ARGS{action}||'' %>" />
<& /Elements/GnuPG/SignEncryptWidget:ShowIssues, self => $gnupg_widget &>
@@ -181,7 +181,7 @@
# for the convenience:
my ($commentDefault, $ResponseDefault);
-if ($Action ne 'Respond') {
+if ($action ne 'respond') {
$commentDefault = "SELECTED";
$ResponseDefault = "";
} else {
@@ -257,6 +257,6 @@
<%ARGS>
$id => undef
-$Action => undef
+$action => undef
$DefaultStatus => undef
</%ARGS>
Modified: rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/Notify.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/Notify.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/Notify.pm Mon Feb 4 12:39:43 2008
@@ -80,11 +80,11 @@
my $ticket = $self->ticket_obj;
my $arg = $self->argument;
- $arg =~ s/\bAll\b/Owner,Requestor,AdminCc,Cc/;
+ $arg =~ s/\bAll\b/Owner,Requestor,AdminCc,Cc/i;
my ( @To, @PseudoTo, @Cc, @Bcc );
- if ( $arg =~ /\bOtherRecipients\b/ ) {
+ if ( $arg =~ /\bOther_?Recipients\b/i ) {
if ( my $attachment = $self->transaction_obj->attachments->first ) {
push @Cc,
map { $_->address }
@@ -96,11 +96,11 @@
}
}
- if ( $arg =~ /\bRequestor\b/ ) {
+ if ( $arg =~ /\bRequestor\b/i ) {
push @To, $ticket->requestors->member_emails;
}
- if ( $arg =~ /\bCc\b/ ) {
+ if ( $arg =~ /\bCc\b/i ) {
#If we have a To, make the Ccs, Ccs, otherwise, promote them to To
if (@To) {
@@ -112,7 +112,7 @@
}
}
- if ( $arg =~ /\bOwner\b/ && $ticket->owner_obj->id != RT->nobody->id ) {
+ if ( $arg =~ /\bOwner\b/i && $ticket->owner_obj->id != RT->nobody->id ) {
# If we're not sending to Ccs or requestors,
# then the Owner can be the To.
@@ -123,7 +123,7 @@
}
}
- if ( $arg =~ /\bAdminCc\b/ ) {
+ if ( $arg =~ /\bAdmin_?Cc\b/i ) {
push( @Bcc, $ticket->admin_cc->member_emails );
push( @Bcc, $ticket->queue_obj->admin_cc->member_emails );
}
More information about the Rt-commit
mailing list