[otrs-cvs] otrs/Kernel/Modules AgentTicketEmail.pm, 1.206.2.8, 1.206.2.9 AgentTicketActionCommon.pm, 1.81.2.9, 1.81.2.10 AgentTicketPhone.pm, 1.236.2.9, 1.236.2.10

Comments:
Update of /home/cvs/otrs/Kernel/Modules
In directory lancelot:/tmp/cvs-serv32414/Kernel/Modules

Modified Files:
      Tag: rel-3_1
	AgentTicketEmail.pm AgentTicketActionCommon.pm 
	AgentTicketPhone.pm 
Log Message:
 - 2013-01-29 Fixed bug#9096 - All services list is shown instead of only default services.

Author: cr

Index: AgentTicketEmail.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AgentTicketEmail.pm,v
retrieving revision 1.206.2.8
retrieving revision 1.206.2.9
diff -2 -u -d -r1.206.2.8 -r1.206.2.9
--- AgentTicketEmail.pm	17 Oct 2012 20:20:40 -0000	1.206.2.8
+++ AgentTicketEmail.pm	30 Jan 2013 00:00:06 -0000	1.206.2.9
@@ -1,5 +1,5 @@
 # --
 # Kernel/Modules/AgentTicketEmail.pm - to compose initial email to customer
-# Copyright (C) 2001-2012 OTRS AG, http://otrs.org/
+# Copyright (C) 2001-2013 OTRS AG, http://otrs.org/
 # --
 # $Id$
@@ -1706,6 +1706,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: cr

Index: AgentTicketActionCommon.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AgentTicketActionCommon.pm,v
retrieving revision 1.81.2.9
retrieving revision 1.81.2.10
diff -2 -u -d -r1.81.2.9 -r1.81.2.10
--- AgentTicketActionCommon.pm	24 Sep 2012 09:28:05 -0000	1.81.2.9
+++ AgentTicketActionCommon.pm	30 Jan 2013 00:00:06 -0000	1.81.2.10
@@ -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$
@@ -1687,10 +1687,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: cr

Index: AgentTicketPhone.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AgentTicketPhone.pm,v
retrieving revision 1.236.2.9
retrieving revision 1.236.2.10
diff -2 -u -d -r1.236.2.9 -r1.236.2.10
--- AgentTicketPhone.pm	11 Dec 2012 22:29:35 -0000	1.236.2.9
+++ AgentTicketPhone.pm	30 Jan 2013 00:00:06 -0000	1.236.2.10
@@ -1,5 +1,5 @@
 # --
 # Kernel/Modules/AgentTicketPhone.pm - to handle phone calls
-# Copyright (C) 2001-2012 OTRS AG, http://otrs.org/
+# Copyright (C) 2001-2013 OTRS AG, http://otrs.org/
 # --
 # $Id$
@@ -1644,6 +1644,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