[otrs-cvs] ITSMIncidentProblemManagement/Kernel/Modules AgentTicketPhone.pm, 1.51, 1.52 CustomerTicketZoom.pm, 1.21, 1.22 AgentTicketZoom.pm, 1.38, 1.39
"CVS commits notifications of OTRS.org" <[email protected]>
| Newsgroups | gmane.comp.otrs.cvs |
|---|---|
| Message-ID | <[email protected]> |
Comments:
Update of /home/cvs/ITSMIncidentProblemManagement/Kernel/Modules
In directory lancelot:/tmp/cvs-serv25850/Kernel/Modules
Modified Files:
AgentTicketPhone.pm CustomerTicketZoom.pm AgentTicketZoom.pm
Log Message:
Updated file to the latest framework version.
Author: ub
Index: AgentTicketPhone.pm
===================================================================
RCS file: /home/cvs/ITSMIncidentProblemManagement/Kernel/Modules/AgentTicketPhone.pm,v
retrieving revision 1.51
retrieving revision 1.52
diff -2 -u -d -r1.51 -r1.52
--- AgentTicketPhone.pm 3 Dec 2012 10:29:33 -0000 1.51
+++ AgentTicketPhone.pm 2 Jan 2013 14:18:40 -0000 1.52
@@ -1,8 +1,8 @@
# --
# 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$
-# $OldId: AgentTicketPhone.pm,v 1.249 2012/11/20 14:50:19 mh Exp $
+# $OldId: AgentTicketPhone.pm,v 1.250 2012/12/11 22:29:58 cr Exp $
# --
# This software comes with ABSOLUTELY NO WARRANTY. For details, see
@@ -939,4 +939,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};
}
}
Author: ub
Index: CustomerTicketZoom.pm
===================================================================
RCS file: /home/cvs/ITSMIncidentProblemManagement/Kernel/Modules/CustomerTicketZoom.pm,v
retrieving revision 1.21
retrieving revision 1.22
diff -2 -u -d -r1.21 -r1.22
--- CustomerTicketZoom.pm 22 Nov 2012 13:07:46 -0000 1.21
+++ CustomerTicketZoom.pm 2 Jan 2013 14:18:40 -0000 1.22
@@ -1,8 +1,8 @@
# --
# Kernel/Modules/CustomerTicketZoom.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$
-# $OldId: CustomerTicketZoom.pm,v 1.106 2012/11/20 14:54:36 mh Exp $
+# $OldId: CustomerTicketZoom.pm,v 1.107 2012/12/12 09:10:15 mab Exp $
# --
# This software comes with ABSOLUTELY NO WARRANTY. For details, see
@@ -1403,5 +1403,4 @@
$Self->{LayoutObject}->Block(
Name => 'NoArticles',
- Data => {},
);
}
@@ -1445,161 +1444,161 @@
);
}
+ }
- # check follow up permissions
- my $FollowUpPossible
- = $Self->{QueueObject}->GetFollowUpOption( QueueID => $Article{QueueID}, );
- my %State = $Self->{StateObject}->StateGet(
- ID => $Article{StateID},
- );
- if (
- $Self->{TicketObject}->TicketCustomerPermission(
- Type => 'update',
- TicketID => $Self->{TicketID},
- UserID => $Self->{UserID}
- )
- && (
- ( $FollowUpPossible !~ /(new ticket|reject)/i && $State{TypeName} =~ /^close/i )
- || $State{TypeName} !~ /^close/i
- )
- )
- {
+ # check follow up permissions
+ my $FollowUpPossible
+ = $Self->{QueueObject}->GetFollowUpOption( QueueID => $Article{QueueID}, );
+ my %State = $Self->{StateObject}->StateGet(
+ ID => $Article{StateID},
+ );
+ if (
+ $Self->{TicketObject}->TicketCustomerPermission(
+ Type => 'update',
+ TicketID => $Self->{TicketID},
+ UserID => $Self->{UserID}
+ )
+ && (
+ ( $FollowUpPossible !~ /(new ticket|reject)/i && $State{TypeName} =~ /^close/i )
+ || $State{TypeName} !~ /^close/i
+ )
+ )
+ {
- my $DynamicFieldNames = $Self->_GetFieldsToUpdate(
- OnlyDynamicFields => 1,
- );
+ my $DynamicFieldNames = $Self->_GetFieldsToUpdate(
+ OnlyDynamicFields => 1,
+ );
- # create a string with the quoted dynamic field names separated by a commas
- if ( IsArrayRefWithData($DynamicFieldNames) ) {
- my $FirstItem = 1;
- FIELD:
- for my $Field ( @{$DynamicFieldNames} ) {
- if ($FirstItem) {
- $FirstItem = 0;
- }
- else {
- $Param{DynamicFieldNamesStrg} .= ', ';
- }
- $Param{DynamicFieldNamesStrg} .= "'" . $Field . "'";
+ # create a string with the quoted dynamic field names separated by a commas
+ if ( IsArrayRefWithData($DynamicFieldNames) ) {
+ my $FirstItem = 1;
+ FIELD:
+ for my $Field ( @{$DynamicFieldNames} ) {
+ if ($FirstItem) {
+ $FirstItem = 0;
+ }
+ else {
+ $Param{DynamicFieldNamesStrg} .= ', ';
}
+ $Param{DynamicFieldNamesStrg} .= "'" . $Field . "'";
}
+ }
+
+ # check subject
+ if ( !$Param{Subject} ) {
+ $Param{Subject} = "Re: $Param{Title}";
+ }
+ $Self->{LayoutObject}->Block(
+ Name => 'FollowUp',
+ Data => \%Param,
+ );
+
+ # add rich text editor
+ if ( $Self->{LayoutObject}->{BrowserRichText} ) {
+
+ # use height/width defined for this screen
+ $Param{RichTextHeight} = $Self->{Config}->{RichTextHeight} || 0;
+ $Param{RichTextWidth} = $Self->{Config}->{RichTextWidth} || 0;
- # check subject
- if ( !$Param{Subject} ) {
- $Param{Subject} = "Re: $Param{Title}";
- }
$Self->{LayoutObject}->Block(
- Name => 'FollowUp',
+ Name => 'RichText',
Data => \%Param,
);
+ }
- # add rich text editor
- if ( $Self->{LayoutObject}->{BrowserRichText} ) {
-
- # use height/width defined for this screen
- $Param{RichTextHeight} = $Self->{Config}->{RichTextHeight} || 0;
- $Param{RichTextWidth} = $Self->{Config}->{RichTextWidth} || 0;
-
- $Self->{LayoutObject}->Block(
- Name => 'RichText',
- Data => \%Param,
- );
+ # build next states string
+ if ( $Self->{Config}->{State} ) {
+ my %NextStates = $Self->{TicketObject}->TicketStateList(
+ TicketID => $Self->{TicketID},
+ Action => $Self->{Action},
+ CustomerUserID => $Self->{UserID},
+ );
+ my %StateSelected;
+ if ( $Param{StateID} ) {
+ $StateSelected{SelectedID} = $Param{StateID};
}
-
- # build next states string
- if ( $Self->{Config}->{State} ) {
- my %NextStates = $Self->{TicketObject}->TicketStateList(
- TicketID => $Self->{TicketID},
- Action => $Self->{Action},
- CustomerUserID => $Self->{UserID},
- );
- my %StateSelected;
- if ( $Param{StateID} ) {
- $StateSelected{SelectedID} = $Param{StateID};
- }
- else {
- $StateSelected{SelectedValue} = $Self->{Config}->{StateDefault};
- }
- $Param{NextStatesStrg} = $Self->{LayoutObject}->BuildSelection(
- Data => \%NextStates,
- Name => 'StateID',
- %StateSelected,
- );
- $Self->{LayoutObject}->Block(
- Name => 'FollowUpState',
- Data => \%Param,
- );
+ else {
+ $StateSelected{SelectedValue} = $Self->{Config}->{StateDefault};
}
+ $Param{NextStatesStrg} = $Self->{LayoutObject}->BuildSelection(
+ Data => \%NextStates,
+ Name => 'StateID',
+ %StateSelected,
+ );
+ $Self->{LayoutObject}->Block(
+ Name => 'FollowUpState',
+ Data => \%Param,
+ );
+ }
- # get priority
- if ( $Self->{Config}->{Priority} ) {
- my %Priorities = $Self->{TicketObject}->TicketPriorityList(
- CustomerUserID => $Self->{UserID},
- Action => $Self->{Action},
- );
- my %PrioritySelected;
- if ( $Param{PriorityID} ) {
- $PrioritySelected{SelectedID} = $Param{PriorityID};
- }
- else {
- $PrioritySelected{SelectedValue} = $Self->{Config}->{PriorityDefault}
- || '3 normal';
- }
- $Param{PriorityStrg} = $Self->{LayoutObject}->BuildSelection(
- Data => \%Priorities,
- Name => 'PriorityID',
- %PrioritySelected,
- );
- $Self->{LayoutObject}->Block(
- Name => 'FollowUpPriority',
- Data => \%Param,
- );
+ # get priority
+ if ( $Self->{Config}->{Priority} ) {
+ my %Priorities = $Self->{TicketObject}->TicketPriorityList(
+ CustomerUserID => $Self->{UserID},
+ Action => $Self->{Action},
+ );
+ my %PrioritySelected;
+ if ( $Param{PriorityID} ) {
+ $PrioritySelected{SelectedID} = $Param{PriorityID};
+ }
+ else {
+ $PrioritySelected{SelectedValue} = $Self->{Config}->{PriorityDefault}
+ || '3 normal';
}
+ $Param{PriorityStrg} = $Self->{LayoutObject}->BuildSelection(
+ Data => \%Priorities,
+ Name => 'PriorityID',
+ %PrioritySelected,
+ );
+ $Self->{LayoutObject}->Block(
+ Name => 'FollowUpPriority',
+ Data => \%Param,
+ );
+ }
- # Dynamic fields
- # cycle trough the activated Dynamic Fields for this screen
- DYNAMICFIELD:
- for my $DynamicFieldConfig ( @{ $Self->{FollowUpDynamicField} } ) {
- next DYNAMICFIELD if !IsHashRefWithData($DynamicFieldConfig);
+ # Dynamic fields
+ # cycle trough the activated Dynamic Fields for this screen
+ DYNAMICFIELD:
+ for my $DynamicFieldConfig ( @{ $Self->{FollowUpDynamicField} } ) {
+ next DYNAMICFIELD if !IsHashRefWithData($DynamicFieldConfig);
- # skip fields that HTML could not be retrieved
- next DYNAMICFIELD if !IsHashRefWithData(
- $Param{DynamicFieldHTML}->{ $DynamicFieldConfig->{Name} }
- );
+ # skip fields that HTML could not be retrieved
+ next DYNAMICFIELD if !IsHashRefWithData(
+ $Param{DynamicFieldHTML}->{ $DynamicFieldConfig->{Name} }
+ );
- # get the html strings form $Param
- my $DynamicFieldHTML = $Param{DynamicFieldHTML}->{ $DynamicFieldConfig->{Name} };
+ # get the html strings form $Param
+ my $DynamicFieldHTML = $Param{DynamicFieldHTML}->{ $DynamicFieldConfig->{Name} };
- $Self->{LayoutObject}->Block(
- Name => 'FollowUpDynamicField',
- Data => {
- Name => $DynamicFieldConfig->{Name},
- Label => $DynamicFieldHTML->{Label},
- Field => $DynamicFieldHTML->{Field},
- },
- );
+ $Self->{LayoutObject}->Block(
+ Name => 'FollowUpDynamicField',
+ Data => {
+ Name => $DynamicFieldConfig->{Name},
+ Label => $DynamicFieldHTML->{Label},
+ Field => $DynamicFieldHTML->{Field},
+ },
+ );
- # example of dynamic fields order customization
- $Self->{LayoutObject}->Block(
- Name => 'FollowUpDynamicField_' . $DynamicFieldConfig->{Name},
- Data => {
- Name => $DynamicFieldConfig->{Name},
- Label => $DynamicFieldHTML->{Label},
- Field => $DynamicFieldHTML->{Field},
- },
- );
- }
+ # example of dynamic fields order customization
+ $Self->{LayoutObject}->Block(
+ Name => 'FollowUpDynamicField_' . $DynamicFieldConfig->{Name},
+ Data => {
+ Name => $DynamicFieldConfig->{Name},
+ Label => $DynamicFieldHTML->{Label},
+ Field => $DynamicFieldHTML->{Field},
+ },
+ );
+ }
- # show attachments
- # get all attachments meta data
- my @Attachments = $Self->{UploadCacheObject}->FormIDGetAllFilesMeta(
- FormID => $Self->{FormID},
+ # show attachments
+ # get all attachments meta data
+ my @Attachments = $Self->{UploadCacheObject}->FormIDGetAllFilesMeta(
+ FormID => $Self->{FormID},
+ );
+ for my $Attachment (@Attachments) {
+ next if $Attachment->{ContentID} && $Self->{LayoutObject}->{BrowserRichText};
+ $Self->{LayoutObject}->Block(
+ Name => 'FollowUpAttachment',
+ Data => $Attachment,
);
- for my $Attachment (@Attachments) {
- next if $Attachment->{ContentID} && $Self->{LayoutObject}->{BrowserRichText};
- $Self->{LayoutObject}->Block(
- Name => 'FollowUpAttachment',
- Data => $Attachment,
- );
- }
}
}
Author: ub
Index: AgentTicketZoom.pm
===================================================================
RCS file: /home/cvs/ITSMIncidentProblemManagement/Kernel/Modules/AgentTicketZoom.pm,v
retrieving revision 1.38
retrieving revision 1.39
diff -2 -u -d -r1.38 -r1.39
--- AgentTicketZoom.pm 22 Nov 2012 15:24:43 -0000 1.38
+++ AgentTicketZoom.pm 2 Jan 2013 14:18:40 -0000 1.39
@@ -1,8 +1,8 @@
# --
# 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$
-# $OldId: AgentTicketZoom.pm,v 1.194 2012/11/20 14:52:48 mh Exp $
+# $OldId: AgentTicketZoom.pm,v 1.195 2013/01/02 13:02:29 mn Exp $
# --
# This software comes with ABSOLUTELY NO WARRANTY. For details, see
@@ -1765,5 +1765,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" ';
---------------------------------------------------------------------
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