[otrs-cvs] ITSMIncidentProblemManagement/Kernel/Modules AgentTicketActionCommon.pm, 1.35, 1.36 AgentTicketPhone.pm, 1.52, 1.53 AgentTicketEmail.pm, 1.45, 1.46

Comments:
Update of /home/cvs/ITSMIncidentProblemManagement/Kernel/Modules
In directory lancelot:/tmp/cvs-serv14583/Kernel/Modules

Modified Files:
	AgentTicketActionCommon.pm AgentTicketPhone.pm 
	AgentTicketEmail.pm 
Log Message:
Updated file to latest framework version.

Author: ub

Index: AgentTicketActionCommon.pm
===================================================================
RCS file: /home/cvs/ITSMIncidentProblemManagement/Kernel/Modules/AgentTicketActionCommon.pm,v
retrieving revision 1.35
retrieving revision 1.36
diff -2 -u -d -r1.35 -r1.36
--- AgentTicketActionCommon.pm	11 Jan 2013 09:46:30 -0000	1.35
+++ AgentTicketActionCommon.pm	30 Jan 2013 14:05:10 -0000	1.36
@@ -4,5 +4,5 @@
 # --
 # $Id$
-# $OldId: AgentTicketActionCommon.pm,v 1.103 2013/01/10 11:48:52 mb Exp $
+# $OldId: AgentTicketActionCommon.pm,v 1.105 2013/01/30 00:00:42 cr Exp $
 # --
 # This software comes with ABSOLUTELY NO WARRANTY. For details, see
@@ -1494,5 +1494,5 @@
         $Param{ResponsibleStrg} = $Self->{LayoutObject}->BuildSelection(
             Data         => \%ShownUsers,
-            SelectedID   => $Param{NewResponsibleID} || $Ticket{ResponsibleID},
+            SelectedID   => $Param{NewResponsibleID},
             Name         => 'NewResponsibleID',
             PossibleNone => 1,
@@ -1956,10 +1956,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: AgentTicketPhone.pm
===================================================================
RCS file: /home/cvs/ITSMIncidentProblemManagement/Kernel/Modules/AgentTicketPhone.pm,v
retrieving revision 1.52
retrieving revision 1.53
diff -2 -u -d -r1.52 -r1.53
--- AgentTicketPhone.pm	2 Jan 2013 14:18:40 -0000	1.52
+++ AgentTicketPhone.pm	30 Jan 2013 14:05:10 -0000	1.53
@@ -4,5 +4,5 @@
 # --
 # $Id$
-# $OldId: AgentTicketPhone.pm,v 1.250 2012/12/11 22:29:58 cr Exp $
+# $OldId: AgentTicketPhone.pm,v 1.251 2013/01/30 00:00:42 cr Exp $
 # --
 # This software comes with ABSOLUTELY NO WARRANTY. For details, see
@@ -1847,6 +1847,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: AgentTicketEmail.pm
===================================================================
RCS file: /home/cvs/ITSMIncidentProblemManagement/Kernel/Modules/AgentTicketEmail.pm,v
retrieving revision 1.45
retrieving revision 1.46
diff -2 -u -d -r1.45 -r1.46
--- AgentTicketEmail.pm	22 Nov 2012 13:50:27 -0000	1.45
+++ AgentTicketEmail.pm	30 Jan 2013 14:05:10 -0000	1.46
@@ -1,8 +1,8 @@
 # --
 # 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$
-# $OldId: AgentTicketEmail.pm,v 1.219 2012/11/20 14:48:37 mh Exp $
+# $OldId: AgentTicketEmail.pm,v 1.220 2013/01/30 00:00:42 cr Exp $
 # --
 # This software comes with ABSOLUTELY NO WARRANTY. For details, see
@@ -1911,6 +1911,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