[otrs-cvs] ITSMIncidentProblemManagement/Kernel/Modules AgentTicketEmail.pm, 1.44.2.1, 1.44.2.2 AgentTicketActionCommon.pm, 1.33, 1.33.2.1 AgentTicketZoom.pm, 1.36, 1.36.2.1 AgentTicketPhone.pm, 1.49.2.2, 1.49.2.3
"CVS commits notifications of OTRS.org" <[email protected]> Tue, 26 Mar 2013 16:22:48 +0000
| Newsgroups | gmane.comp.otrs.cvs |
|---|---|
| Message-ID | <[email protected]> |
Comments:
Update of /home/cvs/ITSMIncidentProblemManagement/Kernel/Modules
In directory lancelot:/tmp/cvs-serv2241/Kernel/Modules
Modified Files:
Tag: rel-3_1
AgentTicketEmail.pm AgentTicketActionCommon.pm
AgentTicketZoom.pm AgentTicketPhone.pm
Log Message:
Updated file to latest framework version.
Author: ub
Index: AgentTicketEmail.pm
===================================================================
RCS file: /home/cvs/ITSMIncidentProblemManagement/Kernel/Modules/AgentTicketEmail.pm,v
retrieving revision 1.44.2.1
retrieving revision 1.44.2.2
diff -2 -u -d -r1.44.2.1 -r1.44.2.2
--- AgentTicketEmail.pm 8 Feb 2013 11:29:51 -0000 1.44.2.1
+++ AgentTicketEmail.pm 26 Mar 2013 16:22:41 -0000 1.44.2.2
@@ -1889,6 +1889,13 @@
= $Self->{ConfigObject}->Get('Ticket::Service::Default::UnknownCustomer');
+ # check if no CustomerUserID is selected
+ # if $DefaultServiceUnknownCustomer = 0 leave CustomerUserID empty, it will not get any services
+ # if $DefaultServiceUnknownCustomer = 1 set CustomerUserID to get default services
+ if ( !$Param{CustomerUserID} && $DefaultServiceUnknownCustomer ) {
+ $Param{CustomerUserID} = '<DEFAULT>';
+ }
+
# get service list
- if ( $Param{CustomerUserID} || $DefaultServiceUnknownCustomer ) {
+ if ( $Param{CustomerUserID} ) {
%Service = $Self->{TicketObject}->TicketServiceList(
%Param,
Author: ub
Index: AgentTicketActionCommon.pm
===================================================================
RCS file: /home/cvs/ITSMIncidentProblemManagement/Kernel/Modules/AgentTicketActionCommon.pm,v
retrieving revision 1.33
retrieving revision 1.33.2.1
diff -2 -u -d -r1.33 -r1.33.2.1
--- AgentTicketActionCommon.pm 2 Oct 2012 11:02:03 -0000 1.33
+++ AgentTicketActionCommon.pm 26 Mar 2013 16:22:41 -0000 1.33.2.1
@@ -1,5 +1,5 @@
# --
# Kernel/Modules/AgentTicketActionCommon.pm - common file for several modules
-# Copyright (C) 2001-2012 OTRS AG, http://otrs.org/
+# Copyright (C) 2001-2013 OTRS AG, http://otrs.org/
# --
# $Id$
@@ -1247,5 +1247,5 @@
Name => 'TypeID',
SelectedID => $Param{TypeID},
- PossibleNone => 0,
+ PossibleNone => 1,
Sort => 'AlphanumericValue',
Translation => 0,
@@ -1854,10 +1854,13 @@
= $Self->{ConfigObject}->Get('Ticket::Service::Default::UnknownCustomer');
+ # check if no CustomerUserID is selected
+ # if $DefaultServiceUnknownCustomer = 0 leave CustomerUserID empty, it will not get any services
+ # if $DefaultServiceUnknownCustomer = 1 set CustomerUserID to get default services
+ if ( !$Param{CustomerUserID} && $DefaultServiceUnknownCustomer ) {
+ $Param{CustomerUserID} = '<DEFAULT>';
+ }
+
# get service list
- if (
- ( defined $Param{CustomerUserID} && $Param{CustomerUserID} )
- || $DefaultServiceUnknownCustomer
- )
- {
+ if ( $Param{CustomerUserID} ) {
%Service = $Self->{TicketObject}->TicketServiceList(
%Param,
Author: ub
Index: AgentTicketZoom.pm
===================================================================
RCS file: /home/cvs/ITSMIncidentProblemManagement/Kernel/Modules/AgentTicketZoom.pm,v
retrieving revision 1.36
retrieving revision 1.36.2.1
diff -2 -u -d -r1.36 -r1.36.2.1
--- AgentTicketZoom.pm 1 Aug 2012 12:11:59 -0000 1.36
+++ AgentTicketZoom.pm 26 Mar 2013 16:22:41 -0000 1.36.2.1
@@ -1,5 +1,5 @@
# --
# Kernel/Modules/AgentTicketZoom.pm - to get a closer view
-# Copyright (C) 2001-2012 OTRS AG, http://otrs.org/
+# Copyright (C) 2001-2013 OTRS AG, http://otrs.org/
# --
# $Id$
@@ -458,5 +458,5 @@
next ARTICLE
if $Self->{ConfigObject}->Get('Ticket::NewArticleIgnoreSystemSender')
- && $Article->{SenderType} eq 'system';
+ && $Article->{SenderType} eq 'system';
# get article flags
@@ -1107,5 +1107,5 @@
next ARTICLE
if $Self->{ConfigObject}->Get('Ticket::NewArticleIgnoreSystemSender')
- && $Article->{SenderType} eq 'system';
+ && $Article->{SenderType} eq 'system';
# get article flags
@@ -1362,5 +1362,5 @@
# if attachment will be forced to download, don't open a new download window!
- my $Target = '';
+ my $Target = 'target="AttachmentWindow" ';
if ( $Type =~ /inline/i ) {
$Target = 'target="attachment" ';
Author: ub
Index: AgentTicketPhone.pm
===================================================================
RCS file: /home/cvs/ITSMIncidentProblemManagement/Kernel/Modules/AgentTicketPhone.pm,v
retrieving revision 1.49.2.2
retrieving revision 1.49.2.3
diff -2 -u -d -r1.49.2.2 -r1.49.2.3
--- AgentTicketPhone.pm 8 Feb 2013 11:29:51 -0000 1.49.2.2
+++ AgentTicketPhone.pm 26 Mar 2013 16:22:41 -0000 1.49.2.3
@@ -923,4 +923,11 @@
if ( $CustomerUserData{UserLogin} ) {
$CustomerUser = $CustomerUserData{UserLogin};
+ $FromExternalCustomer{Customer} = $CustomerUserData{UserLogin};
+ }
+ if ( $FromExternalCustomer{Customer} ) {
+ my %ExternalCustomerUserData = $Self->{CustomerUserObject}->CustomerUserDataGet(
+ User => $FromExternalCustomer{Customer},
+ );
+ $FromExternalCustomer{Email} = $ExternalCustomerUserData{UserEmail};
}
}
@@ -1818,6 +1825,13 @@
= $Self->{ConfigObject}->Get('Ticket::Service::Default::UnknownCustomer');
+ # check if no CustomerUserID is selected
+ # if $DefaultServiceUnknownCustomer = 0 leave CustomerUserID empty, it will not get any services
+ # if $DefaultServiceUnknownCustomer = 1 set CustomerUserID to get default services
+ if ( !$Param{CustomerUserID} && $DefaultServiceUnknownCustomer ) {
+ $Param{CustomerUserID} = '<DEFAULT>';
+ }
+
# get service list
- if ( $Param{CustomerUserID} || $DefaultServiceUnknownCustomer ) {
+ if ( $Param{CustomerUserID} ) {
%Service = $Self->{TicketObject}->TicketServiceList(
%Param,
---------------------------------------------------------------------
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