[otrs-cvs] ITSMIncidentProblemManagement/Kernel/Modules AgentTicketPrint.pm, 1.13, 1.14 AgentTicketEmail.pm, 1.48, 1.49 AgentTicketPhone.pm, 1.57, 1.58 AgentTicketActionCommon.pm, 1.38, 1.39 CustomerTicketZoom.pm, 1.25, 1.26 AgentTicketZoom.pm, 1.43, 1.44
"CVS commits notifications of OTRS.org" <[email protected]> Tue, 18 Jun 2013 14:30:08 +0000
| Newsgroups | gmane.comp.otrs.cvs |
|---|---|
| Message-ID | <[email protected]> |
Comments:
Update of /home/cvs/ITSMIncidentProblemManagement/Kernel/Modules
In directory lancelot:/tmp/cvs-serv22690/Kernel/Modules
Modified Files:
AgentTicketPrint.pm AgentTicketEmail.pm AgentTicketPhone.pm
AgentTicketActionCommon.pm CustomerTicketZoom.pm
AgentTicketZoom.pm
Log Message:
Updated file to latest framework version.
Author: ub
Index: AgentTicketPrint.pm
===================================================================
RCS file: /home/cvs/ITSMIncidentProblemManagement/Kernel/Modules/AgentTicketPrint.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -2 -u -d -r1.13 -r1.14
--- AgentTicketPrint.pm 26 Mar 2013 14:14:00 -0000 1.13
+++ AgentTicketPrint.pm 18 Jun 2013 14:30:03 -0000 1.14
@@ -172,13 +172,12 @@
# check if only one article need printed
if ($ArticleID) {
- my @NewArticleBox;
+
+ ARTICLE:
for my $Article (@ArticleBox) {
if ( $Article->{ArticleID} == $ArticleID ) {
- @NewArticleBox = ($Article);
+ @ArticleBox = ($Article);
+ last ARTICLE;
}
}
- if (@NewArticleBox) {
- @ArticleBox = @NewArticleBox;
- }
}
Author: ub
Index: AgentTicketEmail.pm
===================================================================
RCS file: /home/cvs/ITSMIncidentProblemManagement/Kernel/Modules/AgentTicketEmail.pm,v
retrieving revision 1.48
retrieving revision 1.49
diff -2 -u -d -r1.48 -r1.49
--- AgentTicketEmail.pm 26 Mar 2013 14:14:00 -0000 1.48
+++ AgentTicketEmail.pm 18 Jun 2013 14:30:03 -0000 1.49
@@ -519,9 +519,14 @@
my $PossibleValuesFilter;
+ # get PossibleValues
+ my $PossibleValues = $Self->{BackendObject}->PossibleValuesGet(
+ DynamicFieldConfig => $DynamicFieldConfig,
+ );
+
# check if field has PossibleValues property in its configuration
- if ( IsHashRefWithData( $DynamicFieldConfig->{Config}->{PossibleValues} ) ) {
+ if ( IsHashRefWithData( $PossibleValues ) ) {
# convert possible values key => value to key => key for ACLs usign a Hash slice
- my %AclData = %{ $DynamicFieldConfig->{Config}->{PossibleValues} };
+ my %AclData = %{ $PossibleValues };
@AclData{ keys %AclData } = keys %AclData;
@@ -541,5 +546,5 @@
# convert Filer key => key back to key => value using map
%{$PossibleValuesFilter}
- = map { $_ => $DynamicFieldConfig->{Config}->{PossibleValues}->{$_} }
+ = map { $_ => $PossibleValues->{$_} }
keys %Filter;
}
@@ -788,6 +793,5 @@
$Error{AttachmentUpload} = 1;
my %UploadStuff = $Self->{ParamObject}->GetUploadAll(
- Param => 'FileUpload',
- Source => 'string',
+ Param => 'FileUpload',
);
$Self->{UploadCacheObject}->FormIDAddFile(
@@ -807,9 +811,14 @@
my $PossibleValuesFilter;
+ # get PossibleValues
+ my $PossibleValues = $Self->{BackendObject}->PossibleValuesGet(
+ DynamicFieldConfig => $DynamicFieldConfig,
+ );
+
# check if field has PossibleValues property in its configuration
- if ( IsHashRefWithData( $DynamicFieldConfig->{Config}->{PossibleValues} ) ) {
+ if ( IsHashRefWithData( $PossibleValues ) ) {
# convert possible values key => value to key => key for ACLs usign a Hash slice
- my %AclData = %{ $DynamicFieldConfig->{Config}->{PossibleValues} };
+ my %AclData = %{ $PossibleValues };
@AclData{ keys %AclData } = keys %AclData;
@@ -829,5 +838,5 @@
# convert Filer key => key back to key => value using map
%{$PossibleValuesFilter}
- = map { $_ => $DynamicFieldConfig->{Config}->{PossibleValues}->{$_} }
+ = map { $_ => $PossibleValues->{$_} }
keys %Filter;
}
@@ -1234,6 +1243,5 @@
# get submit attachment
my %UploadStuff = $Self->{ParamObject}->GetUploadAll(
- Param => 'FileUpload',
- Source => 'String',
+ Param => 'FileUpload',
);
if (%UploadStuff) {
@@ -1568,5 +1576,5 @@
next DYNAMICFIELD if $DynamicFieldConfig->{ObjectType} ne 'Ticket';
- my $PossibleValues = $Self->{BackendObject}->AJAXPossibleValuesGet(
+ my $PossibleValues = $Self->{BackendObject}->PossibleValuesGet(
DynamicFieldConfig => $DynamicFieldConfig,
);
@@ -1595,4 +1603,10 @@
}
+ my $DataValues = $Self->{BackendObject}->BuildSelectionDataGet(
+ DynamicFieldConfig => $DynamicFieldConfig,
+ PossibleValues => $PossibleValues,
+ Value => $DynamicFieldValues{ $DynamicFieldConfig->{Name} },
+ ) || $PossibleValues;
+
# add dynamic field to the list of fields to update
push(
@@ -1600,5 +1614,5 @@
{
Name => 'DynamicField_' . $DynamicFieldConfig->{Name},
- Data => $PossibleValues,
+ Data => $DataValues,
SelectedID => $DynamicFieldValues{ $DynamicFieldConfig->{Name} },
Translation => $DynamicFieldConfig->{Config}->{TranslatableValues} || 0,
@@ -2088,4 +2102,5 @@
Class => 'Validate_Required' . ( $Param{Errors}->{DestinationInvalid} || ' ' ),
Name => 'Dest',
+ TreeView => $TreeView,
SelectedID => $Param{FromSelected},
OnChangeSubmit => 0,
@@ -2097,4 +2112,5 @@
Class => 'Validate_Required' . $Param{Errors}->{DestinationInvalid} || ' ',
Name => 'Dest',
+ TreeView => $TreeView,
SelectedID => $Param{FromSelected},
);
Author: ub
Index: AgentTicketPhone.pm
===================================================================
RCS file: /home/cvs/ITSMIncidentProblemManagement/Kernel/Modules/AgentTicketPhone.pm,v
retrieving revision 1.57
retrieving revision 1.58
diff -2 -u -d -r1.57 -r1.58
--- AgentTicketPhone.pm 13 Jun 2013 08:48:10 -0000 1.57
+++ AgentTicketPhone.pm 18 Jun 2013 14:30:03 -0000 1.58
@@ -529,5 +529,5 @@
$SplitTicketParam{NextStateID} = $SplitTicketData{StateID};
- # set Onwer an Responsible
+ # set Owner and Responsible
$SplitTicketParam{UserSelected} = $SplitTicketData{OwnerID};
$SplitTicketParam{ResponsibleUserSelected} = $SplitTicketData{ResponsibleID};
@@ -551,5 +551,5 @@
}
- # cycle trough the activated Dynamic Fields for this screen
+ # cycle through the activated Dynamic Fields for this screen
DYNAMICFIELD:
for my $DynamicFieldConfig ( @{ $Self->{DynamicField} } ) {
@@ -558,9 +558,14 @@
my $PossibleValuesFilter;
+ # get PossibleValues
+ my $PossibleValues = $Self->{BackendObject}->PossibleValuesGet(
+ DynamicFieldConfig => $DynamicFieldConfig,
+ );
+
# check if field has PossibleValues property in its configuration
- if ( IsHashRefWithData( $DynamicFieldConfig->{Config}->{PossibleValues} ) ) {
+ if ( IsHashRefWithData( $PossibleValues ) ) {
- # convert possible values key => value to key => key for ACLs usign a Hash slice
- my %AclData = %{ $DynamicFieldConfig->{Config}->{PossibleValues} };
+ # convert possible values key => value to key => key for ACLs using a Hash slice
+ my %AclData = %{ $PossibleValues };
@AclData{ keys %AclData } = keys %AclData;
@@ -581,5 +586,5 @@
# convert Filer key => key back to key => value using map
%{$PossibleValuesFilter}
- = map { $_ => $DynamicFieldConfig->{Config}->{PossibleValues}->{$_} }
+ = map { $_ => $PossibleValues->{$_} }
keys %Filter;
}
@@ -593,5 +598,5 @@
if ( $Self->{TicketID} && $Article{ArticleID} ) {
- # select TicketID or ArticleID go get the value depending on dynamic field configuration
+ # select TicketID or ArticleID to get the value depending on dynamic field configuration
my $ObjectID
= $DynamicFieldConfig->{ObjectType} eq 'Ticket'
@@ -607,5 +612,5 @@
# otherwise (on a new ticket). Check if the user has a user specific default value for
- # the dynamic field, otherwise will use Dynamc Field default value
+ # the dynamic field, otherwise will use Dynamic Field default value
else {
@@ -819,6 +824,5 @@
$Error{AttachmentUpload} = 1;
my %UploadStuff = $Self->{ParamObject}->GetUploadAll(
- Param => 'FileUpload',
- Source => 'string',
+ Param => 'FileUpload',
);
$Self->{UploadCacheObject}->FormIDAddFile(
@@ -854,5 +858,5 @@
my %DynamicFieldHTML;
- # cycle trough the activated Dynamic Fields for this screen
+ # cycle through the activated Dynamic Fields for this screen
DYNAMICFIELD:
for my $DynamicFieldConfig ( @{ $Self->{DynamicField} } ) {
@@ -861,9 +865,14 @@
my $PossibleValuesFilter;
+ # get PossibleValues
+ my $PossibleValues = $Self->{BackendObject}->PossibleValuesGet(
+ DynamicFieldConfig => $DynamicFieldConfig,
+ );
+
# check if field has PossibleValues property in its configuration
- if ( IsHashRefWithData( $DynamicFieldConfig->{Config}->{PossibleValues} ) ) {
+ if ( IsHashRefWithData( $PossibleValues ) ) {
- # convert possible values key => value to key => key for ACLs usign a Hash slice
- my %AclData = %{ $DynamicFieldConfig->{Config}->{PossibleValues} };
+ # convert possible values key => value to key => key for ACLs using a Hash slice
+ my %AclData = %{ $PossibleValues };
@AclData{ keys %AclData } = keys %AclData;
@@ -882,5 +891,5 @@
# convert Filer key => key back to key => value using map
%{$PossibleValuesFilter}
- = map { $_ => $DynamicFieldConfig->{Config}->{PossibleValues}->{$_} }
+ = map { $_ => $PossibleValues->{$_} }
keys %Filter;
}
@@ -968,5 +977,5 @@
}
- # if more the one customer user exists, show list
+ # if more than one customer user exist, show list
# and clean CustomerUserID and CustomerID
else {
@@ -1186,5 +1195,5 @@
# set ticket dynamic fields
- # cycle trough the activated Dynamic Fields for this screen
+ # cycle through the activated Dynamic Fields for this screen
DYNAMICFIELD:
for my $DynamicFieldConfig ( @{ $Self->{DynamicField} } ) {
@@ -1227,6 +1236,5 @@
# get submit attachment
my %UploadStuff = $Self->{ParamObject}->GetUploadAll(
- Param => 'FileUpload',
- Source => 'String',
+ Param => 'FileUpload',
);
if (%UploadStuff) {
@@ -1300,5 +1308,5 @@
# set article dynamic fields
- # cycle trough the activated Dynamic Fields for this screen
+ # cycle through the activated Dynamic Fields for this screen
DYNAMICFIELD:
for my $DynamicFieldConfig ( @{ $Self->{DynamicField} } ) {
@@ -1413,5 +1421,5 @@
}
- # should i set an unlock?
+ # closed tickets get unlocked
if ( $StateData{TypeName} =~ /^close/i ) {
@@ -1576,5 +1584,5 @@
my @DynamicFieldAJAX;
- # cycle trough the activated Dynamic Fields for this screen
+ # cycle through the activated Dynamic Fields for this screen
DYNAMICFIELD:
for my $DynamicFieldConfig ( @{ $Self->{DynamicField} } ) {
@@ -1586,9 +1594,9 @@
next DYNAMICFIELD if $DynamicFieldConfig->{ObjectType} ne 'Ticket';
- my $PossibleValues = $Self->{BackendObject}->AJAXPossibleValuesGet(
+ my $PossibleValues = $Self->{BackendObject}->PossibleValuesGet(
DynamicFieldConfig => $DynamicFieldConfig,
);
- # convert possible values key => value to key => key for ACLs usign a Hash slice
+ # convert possible values key => value to key => key for ACLs using a Hash slice
my %AclData = %{$PossibleValues};
@AclData{ keys %AclData } = keys %AclData;
@@ -1612,4 +1620,10 @@
}
+ my $DataValues = $Self->{BackendObject}->BuildSelectionDataGet(
+ DynamicFieldConfig => $DynamicFieldConfig,
+ PossibleValues => $PossibleValues,
+ Value => $DynamicFieldValues{ $DynamicFieldConfig->{Name} },
+ ) || $PossibleValues;
+
# add dynamic field to the list of fields to update
push(
@@ -1617,5 +1631,5 @@
{
Name => 'DynamicField_' . $DynamicFieldConfig->{Name},
- Data => $PossibleValues,
+ Data => $DataValues,
SelectedID => $DynamicFieldValues{ $DynamicFieldConfig->{Name} },
Translation => $DynamicFieldConfig->{Config}->{TranslatableValues} || 0,
@@ -2033,4 +2047,5 @@
Size => 0,
Name => 'Dest',
+ TreeView => $TreeView,
SelectedID => $Param{ToSelected},
OnChangeSubmit => 0,
@@ -2042,4 +2057,5 @@
Data => \%NewTo,
Name => 'Dest',
+ TreeView => $TreeView,
SelectedID => $Param{ToSelected},
Translation => 0,
Author: ub
Index: AgentTicketActionCommon.pm
===================================================================
RCS file: /home/cvs/ITSMIncidentProblemManagement/Kernel/Modules/AgentTicketActionCommon.pm,v
retrieving revision 1.38
retrieving revision 1.39
diff -2 -u -d -r1.38 -r1.39
--- AgentTicketActionCommon.pm 13 Jun 2013 08:48:10 -0000 1.38
+++ AgentTicketActionCommon.pm 18 Jun 2013 14:30:03 -0000 1.39
@@ -193,6 +193,8 @@
);
$Output .= $Self->{LayoutObject}->Warning(
- 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.'),
+ 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(
@@ -413,6 +415,5 @@
$Error{AttachmentUpload} = 1;
my %UploadStuff = $Self->{ParamObject}->GetUploadAll(
- Param => 'FileUpload',
- Source => 'string',
+ Param => 'FileUpload',
);
$Self->{UploadCacheObject}->FormIDAddFile(
@@ -539,9 +540,14 @@
my $PossibleValuesFilter;
+ # get PossibleValues
+ my $PossibleValues = $Self->{BackendObject}->PossibleValuesGet(
+ DynamicFieldConfig => $DynamicFieldConfig,
+ );
+
# check if field has PossibleValues property in its configuration
- if ( IsHashRefWithData( $DynamicFieldConfig->{Config}->{PossibleValues} ) ) {
+ if ( IsHashRefWithData( $PossibleValues ) ) {
# convert possible values key => value to key => key for ACLs usign a Hash slice
- my %AclData = %{ $DynamicFieldConfig->{Config}->{PossibleValues} };
+ my %AclData = %{ $PossibleValues };
@AclData{ keys %AclData } = keys %AclData;
@@ -561,5 +567,5 @@
# convert Filer key => key back to key => value using map
%{$PossibleValuesFilter}
- = map { $_ => $DynamicFieldConfig->{Config}->{PossibleValues}->{$_} }
+ = map { $_ => $PossibleValues->{$_} }
keys %Filter;
}
@@ -788,5 +794,5 @@
}
- my $From = "$Self->{UserFirstname} $Self->{UserLastname} <$Self->{UserEmail}>";
+ my $From = "\"$Self->{UserFirstname} $Self->{UserLastname}\" <$Self->{UserEmail}>";
my @NotifyUserIDs = ( @{ $Self->{InformUserID} }, @{ $Self->{InvolvedUserID} } );
$ArticleID = $Self->{TicketObject}->ArticleCreate(
@@ -824,6 +830,5 @@
# get submit attachment
my %UploadStuff = $Self->{ParamObject}->GetUploadAll(
- Param => 'FileUpload',
- Source => 'String',
+ Param => 'FileUpload',
);
if (%UploadStuff) {
@@ -1044,5 +1049,5 @@
next DYNAMICFIELD if $DynamicFieldConfig->{ObjectType} ne 'Ticket';
- my $PossibleValues = $Self->{BackendObject}->AJAXPossibleValuesGet(
+ my $PossibleValues = $Self->{BackendObject}->PossibleValuesGet(
DynamicFieldConfig => $DynamicFieldConfig,
);
@@ -1069,4 +1074,10 @@
}
+ my $DataValues = $Self->{BackendObject}->BuildSelectionDataGet(
+ DynamicFieldConfig => $DynamicFieldConfig,
+ PossibleValues => $PossibleValues,
+ Value => $DynamicFieldValues{ $DynamicFieldConfig->{Name} },
+ ) || $PossibleValues;
+
# add dynamic field to the list of fields to update
push(
@@ -1074,5 +1085,5 @@
{
Name => 'DynamicField_' . $DynamicFieldConfig->{Name},
- Data => $PossibleValues,
+ Data => $DataValues,
SelectedID => $DynamicFieldValues{ $DynamicFieldConfig->{Name} },
Translation => $DynamicFieldConfig->{Config}->{TranslatableValues} || 0,
@@ -1183,9 +1194,14 @@
my $PossibleValuesFilter;
+ # get PossibleValues
+ my $PossibleValues = $Self->{BackendObject}->PossibleValuesGet(
+ DynamicFieldConfig => $DynamicFieldConfig,
+ );
+
# check if field has PossibleValues property in its configuration
- if ( IsHashRefWithData( $DynamicFieldConfig->{Config}->{PossibleValues} ) ) {
+ if ( IsHashRefWithData( $PossibleValues ) ) {
# convert possible values key => value to key => key for ACLs usign a Hash slice
- my %AclData = %{ $DynamicFieldConfig->{Config}->{PossibleValues} };
+ my %AclData = %{ $PossibleValues };
@AclData{ keys %AclData } = keys %AclData;
@@ -1205,5 +1221,5 @@
# convert Filer key => key back to key => value using map
%{$PossibleValuesFilter}
- = map { $_ => $DynamicFieldConfig->{Config}->{PossibleValues}->{$_} }
+ = map { $_ => $PossibleValues->{$_} }
keys %Filter;
}
@@ -1384,4 +1400,5 @@
Name => 'NewQueueID',
SelectedID => $Param{NewQueueID},
+ TreeView => $TreeView,
CurrentQueueID => $Param{QueueID},
OnChangeSubmit => 0,
@@ -1428,11 +1445,18 @@
PossibleNone => 1,
);
- my %UserHash;
+ my @OldOwners;
+ my %SeenOldOwner;
if (@OldUserInfo) {
my $Counter = 1;
for my $User ( reverse @OldUserInfo ) {
- next if $UserHash{ $User->{UserID} };
- $UserHash{ $User->{UserID} } = "$Counter: $User->{UserLastname} "
- . "$User->{UserFirstname} ($User->{UserLogin})";
+
+ # skip if old owner is already in the list
+ next if $SeenOldOwner{ $User->{UserID} };
+ $SeenOldOwner{ $User->{UserID} } = 1;
+ push @OldOwners, {
+ Key => $User->{UserID},
+ Value => "$Counter: $User->{UserLastname} "
+ . "$User->{UserFirstname} ($User->{UserLogin})"
+ };
$Counter++;
}
@@ -1449,5 +1473,5 @@
# build string
$Param{OldOwnerStrg} = $Self->{LayoutObject}->BuildSelection(
- Data => \%UserHash,
+ Data => \@OldOwners,
SelectedID => $OldOwnerSelectedID,
Name => 'OldOwnerID',
@@ -1455,4 +1479,5 @@
PossibleNone => 1,
);
+
if ( $Param{NewOwnerType} && $Param{NewOwnerType} eq 'Old' ) {
$Param{'NewOwnerType::Old'} = 'checked = "checked"';
@@ -1651,5 +1676,6 @@
);
- my %UserHash;
+ my @InvolvedAgents;
+ my %SeenInvolvedAgents;
my $Counter = 1;
@@ -1657,10 +1683,11 @@
for my $User ( reverse @UserIDs ) {
- next USER if $UserHash{ $User->{UserID} };
+ next USER if $SeenInvolvedAgents{ $User->{UserID} };
- $UserHash{ $User->{UserID} }
- = "$Counter: $User->{UserLastname} $User->{UserFirstname} ($User->{UserLogin})";
- }
- continue {
+ push @InvolvedAgents, {
+ Key => $User->{UserID},
+ Value =>
+ "$Counter: $User->{UserLastname} $User->{UserFirstname} ($User->{UserLogin})"
+ };
$Counter++;
}
@@ -1669,5 +1696,5 @@
= $Self->{ConfigObject}->Get('Ticket::Frontend::InvolvedAgentMaxSize') || 3;
$Param{InvolvedAgentStrg} = $Self->{LayoutObject}->BuildSelection(
- Data => \%UserHash,
+ Data => \@InvolvedAgents,
SelectedID => $Self->{InvolvedUserID},
Name => 'InvolvedUserID',
Author: ub
Index: CustomerTicketZoom.pm
===================================================================
RCS file: /home/cvs/ITSMIncidentProblemManagement/Kernel/Modules/CustomerTicketZoom.pm,v
retrieving revision 1.25
retrieving revision 1.26
diff -2 -u -d -r1.25 -r1.26
--- CustomerTicketZoom.pm 13 Jun 2013 08:48:10 -0000 1.25
+++ CustomerTicketZoom.pm 18 Jun 2013 14:30:03 -0000 1.26
@@ -146,13 +146,4 @@
}
- # store last screen
- if ( $Self->{Subaction} ne 'ShowHTMLeMail' ) {
- $Self->{SessionObject}->UpdateSessionID(
- SessionID => $Self->{SessionID},
- Key => 'LastScreenView',
- Value => $Self->{RequestedURL},
- );
- }
-
# get ticket data
my %Ticket = $Self->{TicketObject}->TicketGet(
@@ -282,5 +273,5 @@
next DYNAMICFIELD if $DynamicFieldConfig->{ObjectType} ne 'Ticket';
- my $PossibleValues = $Self->{BackendObject}->AJAXPossibleValuesGet(
+ my $PossibleValues = $Self->{BackendObject}->PossibleValuesGet(
DynamicFieldConfig => $DynamicFieldConfig,
);
@@ -307,4 +298,10 @@
}
+ my $DataValues = $Self->{BackendObject}->BuildSelectionDataGet(
+ DynamicFieldConfig => $DynamicFieldConfig,
+ PossibleValues => $PossibleValues,
+ Value => $DynamicFieldValues{ $DynamicFieldConfig->{Name} },
+ ) || $PossibleValues;
+
# add dynamic field to the list of fields to update
push(
@@ -312,5 +309,5 @@
{
Name => 'DynamicField_' . $DynamicFieldConfig->{Name},
- Data => $PossibleValues,
+ Data => $DataValues,
SelectedID => $DynamicFieldValues{ $DynamicFieldConfig->{Name} },
Translation => $DynamicFieldConfig->{Config}->{TranslatableValues} || 0,
@@ -409,6 +406,5 @@
$Error{AttachmentUpload} = 1;
my %UploadStuff = $Self->{ParamObject}->GetUploadAll(
- Param => "file_upload",
- Source => 'string',
+ Param => "file_upload",
);
$Self->{UploadCacheObject}->FormIDAddFile(
@@ -436,9 +432,14 @@
my $PossibleValuesFilter;
+ # get PossibleValues
+ my $PossibleValues = $Self->{BackendObject}->PossibleValuesGet(
+ DynamicFieldConfig => $DynamicFieldConfig,
+ );
+
# check if field has PossibleValues property in its configuration
- if ( IsHashRefWithData( $DynamicFieldConfig->{Config}->{PossibleValues} ) ) {
+ if ( IsHashRefWithData( $PossibleValues ) ) {
# convert possible values key => value to key => key for ACLs usign a Hash slice
- my %AclData = %{ $DynamicFieldConfig->{Config}->{PossibleValues} };
+ my %AclData = %{ $PossibleValues };
@AclData{ keys %AclData } = keys %AclData;
@@ -458,5 +459,5 @@
# convert Filer key => key back to key => value using map
%{$PossibleValuesFilter}
- = map { $_ => $DynamicFieldConfig->{Config}->{PossibleValues}->{$_} }
+ = map { $_ => $PossibleValues->{$_} }
keys %Filter;
}
@@ -633,6 +634,5 @@
# get submit attachment
my %UploadStuff = $Self->{ParamObject}->GetUploadAll(
- Param => 'file_upload',
- Source => 'String',
+ Param => 'file_upload',
);
if (%UploadStuff) {
@@ -713,9 +713,14 @@
my $PossibleValuesFilter;
+ # get PossibleValues
+ my $PossibleValues = $Self->{BackendObject}->PossibleValuesGet(
+ DynamicFieldConfig => $DynamicFieldConfig,
+ );
+
# check if field has PossibleValues property in its configuration
- if ( IsHashRefWithData( $DynamicFieldConfig->{Config}->{PossibleValues} ) ) {
+ if ( IsHashRefWithData( $PossibleValues ) ) {
# convert possible values key => value to key => key for ACLs usign a Hash slice
- my %AclData = %{ $DynamicFieldConfig->{Config}->{PossibleValues} };
+ my %AclData = %{ $PossibleValues };
@AclData{ keys %AclData } = keys %AclData;
@@ -735,5 +740,5 @@
# convert Filer key => key back to key => value using map
%{$PossibleValuesFilter}
- = map { $_ => $DynamicFieldConfig->{Config}->{PossibleValues}->{$_} }
+ = map { $_ => $PossibleValues->{$_} }
keys %Filter;
}
Author: ub
Index: AgentTicketZoom.pm
===================================================================
RCS file: /home/cvs/ITSMIncidentProblemManagement/Kernel/Modules/AgentTicketZoom.pm,v
retrieving revision 1.43
retrieving revision 1.44
diff -2 -u -d -r1.43 -r1.44
--- AgentTicketZoom.pm 17 Apr 2013 12:28:09 -0000 1.43
+++ AgentTicketZoom.pm 18 Jun 2013 14:30:03 -0000 1.44
@@ -242,5 +242,5 @@
);
- my $Content = $Self->_ArticleItem(
+ $Self->_ArticleItem(
Ticket => \%Ticket,
Article => \%Article,
@@ -249,4 +249,8 @@
Type => 'OnLoad',
);
+ my $Content = $Self->{LayoutObject}->Output(
+ TemplateFile => 'AgentTicketZoom',
+ Data => {%Ticket, %Article, %AclAction},
+ );
if ( !$Content ) {
$Self->{LayoutObject}->FatalError(
@@ -333,13 +337,4 @@
}
- # store last screen
- if ( $Self->{Subaction} ne 'ShowHTMLeMail' ) {
- $Self->{SessionObject}->UpdateSessionID(
- SessionID => $Self->{SessionID},
- Key => 'LastScreenView',
- Value => $Self->{RequestedURL},
- );
- }
-
# article filter is activated in sysconfig
if ( $Self->{ArticleFilterActive} ) {
@@ -660,5 +655,5 @@
}
- $Param{ArticleItems} .= $Self->_ArticleItem(
+ $Self->_ArticleItem(
Ticket => \%Ticket,
Article => \%Article,
@@ -669,4 +664,8 @@
);
}
+ $Param{ArticleItems} .= $Self->{LayoutObject}->Output(
+ TemplateFile => 'AgentTicketZoom',
+ Data => {%Ticket, %AclAction},
+ );
# always show archived tickets as seen
@@ -2521,9 +2520,6 @@
}
- # return output
- return $Self->{LayoutObject}->Output(
- TemplateFile => 'AgentTicketZoom',
- Data => { %Param, %Ticket, %AclAction },
- );
+ return 1;
}
+
1;
---------------------------------------------------------------------
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