[otrs-cvs] ITSMIncidentProblemManagement/Kernel/Modules AgentTicketActionCommon.pm, 1.37, 1.38 AgentTicketPhone.pm, 1.56, 1.57 CustomerTicketZoom.pm, 1.24, 1.25 CustomerTicketPrint.pm, 1.11, 1.12

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

Modified Files:
	AgentTicketActionCommon.pm AgentTicketPhone.pm 
	CustomerTicketZoom.pm CustomerTicketPrint.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.37
retrieving revision 1.38
diff -2 -u -d -r1.37 -r1.38
--- AgentTicketActionCommon.pm	26 Mar 2013 14:14:00 -0000	1.37
+++ AgentTicketActionCommon.pm	13 Jun 2013 08:48:10 -0000	1.38
@@ -193,6 +193,6 @@
                 );
                 $Output .= $Self->{LayoutObject}->Warning(
-                    Message => 'Sorry, you need to be the ticket owner to perform this action.',
-                    Comment => 'Please change the owner first.',
+                    Message => $Self->{LayoutObject}->{LanguageObject}->Get('Sorry, you need to be the ticket owner to perform this action.'),
+                    Comment => $Self->{LayoutObject}->{LanguageObject}->Get('Please change the owner first.'),
                 );
                 $Output .= $Self->{LayoutObject}->Footer(
@@ -1848,5 +1848,12 @@
         Valid => 1,
     );
-    if ( $Param{QueueID} && !$Param{AllUsers} ) {
+
+    # show all users
+    if ( $Self->{ConfigObject}->Get('Ticket::ChangeOwnerToEveryone') ) {
+        %ShownUsers = %AllGroupsMembers;
+    }
+
+    # show only users with responsible or rw pemissions in the queue
+    elsif ( $Param{QueueID} && !$Param{AllUsers} ) {
         my $GID = $Self->{QueueObject}->GetQueueGroupID(
             QueueID => $Param{NewQueueID} || $Param{QueueID}
@@ -1884,5 +1891,12 @@
         Valid => 1,
     );
-    if ( $Param{QueueID} && !$Param{AllUsers} ) {
+
+    # show all users
+    if ( $Self->{ConfigObject}->Get('Ticket::ChangeOwnerToEveryone') ) {
+        %ShownUsers = %AllGroupsMembers;
+    }
+
+    # show only users with owner or rw pemissions in the queue
+    elsif ( $Param{QueueID} && !$Param{AllUsers} ) {
         my $GID = $Self->{QueueObject}->GetQueueGroupID(
             QueueID => $Param{NewQueueID} || $Param{QueueID}

Author: ub

Index: AgentTicketPhone.pm
===================================================================
RCS file: /home/cvs/ITSMIncidentProblemManagement/Kernel/Modules/AgentTicketPhone.pm,v
retrieving revision 1.56
retrieving revision 1.57
diff -2 -u -d -r1.56 -r1.57
--- AgentTicketPhone.pm	10 May 2013 10:24:17 -0000	1.56
+++ AgentTicketPhone.pm	13 Jun 2013 08:48:10 -0000	1.57
@@ -448,6 +448,8 @@
             }
 
-            my $CustomerKey
-                = ( $CustomerDataFrom{UserEmail} eq $EmailAddress ? $Article{CustomerUserID} : '' );
+            my $CustomerKey = '';
+            if ( defined $CustomerDataFrom{UserEmail} && $CustomerDataFrom{UserEmail} eq $EmailAddress ) {
+                $CustomerKey = $Article{CustomerUserID};
+            }
 
             push @MultipleCustomer, {

Author: ub

Index: CustomerTicketZoom.pm
===================================================================
RCS file: /home/cvs/ITSMIncidentProblemManagement/Kernel/Modules/CustomerTicketZoom.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -2 -u -d -r1.24 -r1.25
--- CustomerTicketZoom.pm	26 Mar 2013 14:14:00 -0000	1.24
+++ CustomerTicketZoom.pm	13 Jun 2013 08:48:10 -0000	1.25
@@ -947,7 +947,10 @@
     # ticket owner
     if ( $Self->{Config}->{AttributesView}->{Owner} ) {
+        my $OwnerName = $Self->{AgentUserObject}->UserName(
+            UserID => $Param{OwnerID},
+        );
         $Self->{LayoutObject}->Block(
             Name => 'Owner',
-            Data => \%Param,
+            Data => { OwnerName => $OwnerName },
         );
     }
@@ -960,7 +963,10 @@
         )
     {
+        my $ResponsibleName = $Self->{AgentUserObject}->UserName(
+            UserID => $Param{ResponsibleID},
+        );
         $Self->{LayoutObject}->Block(
             Name => 'Responsible',
-            Data => \%Param,
+            Data => { ResponsibleName => $ResponsibleName },
         );
     }

Author: ub

Index: CustomerTicketPrint.pm
===================================================================
RCS file: /home/cvs/ITSMIncidentProblemManagement/Kernel/Modules/CustomerTicketPrint.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -2 -u -d -r1.11 -r1.12
--- CustomerTicketPrint.pm	22 Nov 2012 13:50:27 -0000	1.11
+++ CustomerTicketPrint.pm	13 Jun 2013 08:48:10 -0000	1.12
@@ -1,5 +1,5 @@
 # --
 # Kernel/Modules/CustomerTicketPrint.pm - print layout for customer interface
-# Copyright (C) 2001-2012 OTRS AG, http://otrs.org/
+# Copyright (C) 2001-2013 OTRS AG, http://otrs.org/
 # --
 # $Id$
@@ -328,5 +328,5 @@
 
     # create left table
-    my $TableLeft;
+    my $TableLeft = [];
 
     # add ticket data, respecting AttributesView configuration
---------------------------------------------------------------------
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