Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #2685: Added check for renderable dynamic fields for calls to EditSectionRender function. #2686

Closed
wants to merge 1 commit into from
Closed

Issue #2685: Added check for renderable dynamic fields for calls to EditSectionRender function. #2686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions Kernel/Modules/AgentTicketActionCommon.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2203,8 +2203,8 @@ sub _Mask {

# render ticket type dynamic fields
my $TicketTypeDynamicFieldHTML;
{
my %DynamicFieldConfigs = map { $_->{Name} => $_ } grep { $_->{ObjectType} eq 'Ticket' } $Self->{DynamicField}->@*;
my %DynamicFieldConfigs = map { $_->{Name} => $_ } grep { $_->{ObjectType} eq 'Ticket' } $Self->{DynamicField}->@*;
if (%DynamicFieldConfigs) {

$TicketTypeDynamicFieldHTML = $Kernel::OM->Get('Kernel::Output::HTML::DynamicField::Mask')->EditSectionRender(
Content => $Self->{TicketMaskDefinition},
Expand Down Expand Up @@ -2719,11 +2719,10 @@ sub _Mask {
}

# render article type dynamic fields
# TODO Think about usable implementation of article type dynamic field definition
my %DynamicFieldConfigs = map { $_->{Name} => $_ } grep { $_->{ObjectType} eq 'Article' } $Self->{DynamicField}->@*;
my $ArticleTypeDynamicFieldHTML;
if ( IsArrayRefWithData( $Self->{ArticleMaskDefinition} ) ) {

# TODO Think about usable implementation of article type dynamic field definition
my %DynamicFieldConfigs = map { $_->{Name} => $_ } grep { $_->{ObjectType} eq 'Article' } $Self->{DynamicField}->@*;
if ( IsArrayRefWithData( $Self->{ArticleMaskDefinition} ) && %DynamicFieldConfigs ) {

$ArticleTypeDynamicFieldHTML = $Kernel::OM->Get('Kernel::Output::HTML::DynamicField::Mask')->EditSectionRender(
Content => $Self->{ArticleMaskDefinition},
Expand Down
4 changes: 2 additions & 2 deletions Kernel/Modules/AgentTicketCompose.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2222,8 +2222,8 @@ sub _Mask {
);

# render dynamic fields
{
my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{DynamicField}->@*;
my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{DynamicField}->@*;
if (%DynamicFieldConfigs) {

# grep dynamic field values from ticket data
my %DynamicFieldValues
Expand Down
4 changes: 2 additions & 2 deletions Kernel/Modules/AgentTicketEmail.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3514,8 +3514,8 @@ sub _MaskEmailNew {
}

# render dynamic fields
{
my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{DynamicField}->@*;
my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{DynamicField}->@*;
if (%DynamicFieldConfigs) {

$Param{DynamicFieldHTML} = $Kernel::OM->Get('Kernel::Output::HTML::DynamicField::Mask')->EditSectionRender(
Content => $Self->{MaskDefinition},
Expand Down
4 changes: 2 additions & 2 deletions Kernel/Modules/AgentTicketEmailOutbound.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1964,8 +1964,8 @@ sub _Mask {
}

# render dynamic fields
{
my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{DynamicField}->@*;
my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{DynamicField}->@*;
if (%DynamicFieldConfigs) {

$Param{DynamicFieldHTML} = $Kernel::OM->Get('Kernel::Output::HTML::DynamicField::Mask')->EditSectionRender(
Content => $Self->{MaskDefinition},
Expand Down
4 changes: 2 additions & 2 deletions Kernel/Modules/AgentTicketForward.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1866,8 +1866,8 @@ sub _Mask {
}

# render dynamic fields
{
my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{DynamicField}->@*;
my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{DynamicField}->@*;
if (%DynamicFieldConfigs) {

$Param{DynamicFieldHTML} = $Kernel::OM->Get('Kernel::Output::HTML::DynamicField::Mask')->EditSectionRender(
Content => $Self->{MaskDefinition},
Expand Down
18 changes: 8 additions & 10 deletions Kernel/Modules/AgentTicketMove.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1490,8 +1490,8 @@ sub AgentMove {
);

# render dynamic fields
{
my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{DynamicField}->@*;
my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{DynamicField}->@*;
if (%DynamicFieldConfigs) {

# grep dynamic field values from ticket data
my %DynamicFieldValues
Expand All @@ -1514,14 +1514,12 @@ sub AgentMove {
},
);

if ( $Self->{DynamicField} ) {
$LayoutObject->Block(
Name => 'WidgetDynamicFields',
Data => {
DynamicFieldHTML => $DynamicFieldHTML,
},
);
}
$LayoutObject->Block(
Name => 'WidgetDynamicFields',
Data => {
DynamicFieldHTML => $DynamicFieldHTML,
},
);

}

Expand Down
4 changes: 2 additions & 2 deletions Kernel/Modules/AgentTicketPhone.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3147,8 +3147,8 @@ sub _MaskPhoneNew {
}

# render dynamic fields
{
my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{DynamicField}->@*;
my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{DynamicField}->@*;
if (%DynamicFieldConfigs) {

$Param{DynamicFieldHTML} = $Kernel::OM->Get('Kernel::Output::HTML::DynamicField::Mask')->EditSectionRender(
Content => $Self->{MaskDefinition},
Expand Down
4 changes: 2 additions & 2 deletions Kernel/Modules/AgentTicketPhoneCommon.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1418,8 +1418,8 @@ sub _MaskPhone {
}

# render dynamic fields
{
my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{DynamicField}->@*;
my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{DynamicField}->@*;
if (%DynamicFieldConfigs) {

$Param{DynamicFieldHTML} = $Kernel::OM->Get('Kernel::Output::HTML::DynamicField::Mask')->EditSectionRender(
Content => $Self->{MaskDefinition},
Expand Down
4 changes: 2 additions & 2 deletions Kernel/Modules/CustomerTicketMessage.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1844,8 +1844,8 @@ sub _MaskNew {
my $SeparateDynamicFields = $ConfigObject->Get('Ticket::CustomerFrontend::SeparateDynamicFields');

# render dynamic fields
{
my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{DynamicField}->@*;
my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{DynamicField}->@*;
if (%DynamicFieldConfigs) {

$Param{DynamicFieldHTML} = $Kernel::OM->Get('Kernel::Output::HTML::DynamicField::Mask')->EditSectionRender(
Content => $Self->{MaskDefinition},
Expand Down
5 changes: 2 additions & 3 deletions Kernel/Modules/CustomerTicketZoom.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2417,9 +2417,8 @@ sub _Mask {
my $SeparateDynamicFields = $ConfigObject->Get('Ticket::CustomerFrontend::SeparateDynamicFields');

# render dynamic fields
if ( $Self->{FollowUpDynamicField}->@* ) {

my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{FollowUpDynamicField}->@*;
my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{FollowUpDynamicField}->@*;
if (%DynamicFieldConfigs) {

# grep dynamic field values
my %DynamicFieldValues = map { $_ => $Param{$_} } grep {/^DynamicField_/} keys %Param;
Expand Down