[otrs-cvs] otrs/Kernel/Modules AgentTicketCompose.pm, 1.175, 1.176 AgentTicketEmail.pm, 1.220, 1.221
"CVS commits notifications of OTRS.org" <[email protected]>
| Newsgroups | gmane.comp.otrs.cvs |
|---|---|
| Message-ID | <[email protected]> |
Comments:
Update of /home/cvs/otrs/Kernel/Modules
In directory lancelot:/tmp/cvs-serv18044/Kernel/Modules
Modified Files:
AgentTicketCompose.pm AgentTicketEmail.pm
Log Message:
- 2013-02-15 Fixed bug#9155 - SMIME: DefaultSignKey not selected in AJAX refreshes.
Author: cr
Index: AgentTicketCompose.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AgentTicketCompose.pm,v
retrieving revision 1.175
retrieving revision 1.176
diff -2 -u -d -r1.175 -r1.176
--- AgentTicketCompose.pm 12 Dec 2012 13:47:24 -0000 1.175
+++ AgentTicketCompose.pm 15 Feb 2013 22:21:47 -0000 1.176
@@ -1,5 +1,5 @@
# --
# Kernel/Modules/AgentTicketCompose.pm - to compose and send a message
-# Copyright (C) 2001-2012 OTRS AG, http://otrs.org/
+# Copyright (C) 2001-2013 OTRS AG, http://otrs.org/
# --
# $Id$
@@ -554,4 +554,8 @@
if ( ref $Self->{ConfigObject}->Get('Ticket::Frontend::ArticleComposeModule') eq 'HASH' )
{
+
+ # use ticket QueueID in compose modules
+ $GetParam{QueueID} = $Ticket{QueueID};
+
my %Jobs = %{ $Self->{ConfigObject}->Get('Ticket::Frontend::ArticleComposeModule') };
for my $Job ( sort keys %Jobs ) {
@@ -878,4 +882,8 @@
# run compose modules
if ( ref $Self->{ConfigObject}->Get('Ticket::Frontend::ArticleComposeModule') eq 'HASH' ) {
+
+ # use ticket QueueID in compose modules
+ $GetParam{QueueID} = $Ticket{QueueID};
+
my %Jobs = %{ $Self->{ConfigObject}->Get('Ticket::Frontend::ArticleComposeModule') };
for my $Job ( sort keys %Jobs ) {
@@ -894,4 +902,9 @@
my %Data = $Object->Data( %GetParam, Config => $Jobs{$Job} );
+ # get AJAX param values
+ if ( $Object->can('GetParamAJAX') ) {
+ %GetParam = ( %GetParam, $Object->GetParamAJAX(%GetParam) )
+ }
+
my $Key = $Object->Option( %GetParam, Config => $Jobs{$Job} );
if ($Key) {
Author: cr
Index: AgentTicketEmail.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AgentTicketEmail.pm,v
retrieving revision 1.220
retrieving revision 1.221
diff -2 -u -d -r1.220 -r1.221
--- AgentTicketEmail.pm 30 Jan 2013 00:00:42 -0000 1.220
+++ AgentTicketEmail.pm 15 Feb 2013 22:21:47 -0000 1.221
@@ -1429,4 +1429,8 @@
# run compose modules
if ( ref $Self->{ConfigObject}->Get('Ticket::Frontend::ArticleComposeModule') eq 'HASH' ) {
+
+ # use QueueID from web request in compose modules
+ $GetParam{QueueID} = $QueueID;
+
my %Jobs = %{ $Self->{ConfigObject}->Get('Ticket::Frontend::ArticleComposeModule') };
for my $Job ( sort keys %Jobs ) {
@@ -1445,4 +1449,9 @@
my %Data = $Object->Data( %GetParam, Config => $Jobs{$Job} );
+ # get AJAX param values
+ if ( $Object->can('GetParamAJAX') ) {
+ %GetParam = ( %GetParam, $Object->GetParamAJAX(%GetParam) )
+ }
+
my $Key = $Object->Option( %GetParam, Config => $Jobs{$Job} );
if ($Key) {
---------------------------------------------------------------------
OTRS mailing list: cvs-log - Webpage: http://otrs.org/
Archive: http://lists.otrs.org/pipermail/cvs-log
To unsubscribe: http://lists.otrs.org/cgi-bin/listinfo/cvs-log