Merge pull request #1472 from RotherOSS/issue-#1470-ajax_encoding

Issue #1470 ajax encoding
RotherOSS · Dec 2, 2021 · 90eed7c · 90eed7c
2 parents c78ed31 + 32119fa
commit 90eed7c
Show file tree

Hide file tree

Showing 2 changed files with 81 additions and 81 deletions.
diff --git a/Kernel/Modules/AgentStatistics.pm b/Kernel/Modules/AgentStatistics.pm
@@ -193,23 +193,22 @@ sub OverviewScreen {
     }
 
     # build output
-    my $Output = $LayoutObject->Header(
-        Title => Translatable('Overview'),
-        Area  => 'Statistics',
-    );
-    $Output .= $LayoutObject->NavigationBar();
-
-    $Output .= $LayoutObject->Output(
-        Data => {
-            %Pagination,
-            %Param,
-            AccessRw       => $Self->{AccessRw},
-            BreadcrumbPath => $Self->{BreadcrumbPath},
-        },
-        TemplateFile => 'AgentStatisticsOverview',
-    );
-    $Output .= $LayoutObject->Footer();
-    return $Output;
+    return join '',
+        $LayoutObject->Header(
+            Title => Translatable('Overview'),
+            Area  => 'Statistics',
+        ),
+        $LayoutObject->NavigationBar(),
+        $LayoutObject->Output(
+            Data => {
+                %Pagination,
+                %Param,
+                AccessRw       => $Self->{AccessRw},
+                BreadcrumbPath => $Self->{BreadcrumbPath},
+            },
+            TemplateFile => 'AgentStatisticsOverview',
+        ),
+        $LayoutObject->Footer();
 }
 
 sub ImportScreen {
@@ -219,20 +218,20 @@ sub ImportScreen {
 
     my %Errors = %{ $Param{Errors} // {} };
 
-    my $Output = $LayoutObject->Header(
-        Title => Translatable('Import'),
-        Area  => 'Statistics',
-    );
-    $Output .= $LayoutObject->NavigationBar();
-    $Output .= $LayoutObject->Output(
-        TemplateFile => 'AgentStatisticsImport',
-        Data         => {
-            %Errors,
-            BreadcrumbPath => $Self->{BreadcrumbPath},
-        },
-    );
-    $Output .= $LayoutObject->Footer();
-    return $Output;
+    return join '',
+        $LayoutObject->Header(
+            Title => Translatable('Import'),
+            Area  => 'Statistics',
+        ),
+        $LayoutObject->NavigationBar(),
+        $LayoutObject->Output(
+            TemplateFile => 'AgentStatisticsImport',
+            Data         => {
+                %Errors,
+                BreadcrumbPath => $Self->{BreadcrumbPath},
+            },
+        ),
+        $LayoutObject->Footer();
 }
 
 sub ImportAction {
@@ -375,22 +374,21 @@ sub EditScreen {
         );
     }
 
-    my $Output = $LayoutObject->Header(
-        Title => Translatable('Edit'),
-        Area  => 'Statistics',
-    );
-    $Output .= $LayoutObject->NavigationBar();
-
-    $Output .= $LayoutObject->Output(
-        TemplateFile => 'AgentStatisticsEdit',
-        Data         => {
-            %Frontend,
-            %{$Stat},
-            BreadcrumbPath => $Self->{BreadcrumbPath},
-        },
-    );
-    $Output .= $LayoutObject->Footer();
-    return $Output;
+    return join '',
+        $LayoutObject->Header(
+            Title => Translatable('Edit'),
+            Area  => 'Statistics',
+        ),
+        $LayoutObject->NavigationBar(),
+        $LayoutObject->Output(
+            TemplateFile => 'AgentStatisticsEdit',
+            Data         => {
+                %Frontend,
+                %{$Stat},
+                BreadcrumbPath => $Self->{BreadcrumbPath},
+            },
+        ),
+        $LayoutObject->Footer();
 }
 
 sub EditAction {
@@ -757,24 +755,23 @@ sub ViewScreen {
         UserID => $Self->{UserID},
     );
 
-    my $Output = $LayoutObject->Header(
-        Title => Translatable('View'),
-        Area  => 'Statistics',
-    );
-    $Output .= $LayoutObject->NavigationBar();
-
-    $Output .= $LayoutObject->Output(
-        TemplateFile => 'AgentStatisticsView',
-        Data         => {
-            AccessRw => $Self->{AccessRw},
-            Errors   => \@Errors,
-            %Frontend,
-            %{$Stat},
-            BreadcrumbPath => $Self->{BreadcrumbPath},
-        },
-    );
-    $Output .= $LayoutObject->Footer();
-    return $Output;
+    return join '',
+        $LayoutObject->Header(
+            Title => Translatable('View'),
+            Area  => 'Statistics',
+        ),
+        $LayoutObject->NavigationBar(),
+        $LayoutObject->Output(
+            TemplateFile => 'AgentStatisticsView',
+            Data         => {
+                AccessRw => $Self->{AccessRw},
+                Errors   => \@Errors,
+                %Frontend,
+                %{$Stat},
+                BreadcrumbPath => $Self->{BreadcrumbPath},
+            },
+        ),
+        $LayoutObject->Footer();
 }
 
 sub AddScreen {
@@ -830,22 +827,22 @@ sub AddScreen {
     $ManualVersion = $1;
 
     # build output
-    my $Output = $LayoutObject->Header(
-        Title => Translatable('Add New Statistic'),
-        Area  => 'Statistics',
-    );
-    $Output .= $LayoutObject->NavigationBar();
-    $Output .= $LayoutObject->Output(
-        TemplateFile => 'AgentStatisticsAdd',
-        Data         => {
-            %Frontend,
-            %Errors,
-            ManualVersion  => $ManualVersion,
-            BreadcrumbPath => $Self->{BreadcrumbPath},
-        },
-    );
-    $Output .= $LayoutObject->Footer();
-    return $Output;
+    return join '',
+        $LayoutObject->Header(
+            Title => Translatable('Add New Statistic'),
+            Area  => 'Statistics',
+        ),
+        $LayoutObject->NavigationBar(),
+        $LayoutObject->Output(
+            TemplateFile => 'AgentStatisticsAdd',
+            Data         => {
+                %Frontend,
+                %Errors,
+                ManualVersion  => $ManualVersion,
+                BreadcrumbPath => $Self->{BreadcrumbPath},
+            },
+        ),
+        $LayoutObject->Footer();
 }
 
 sub AddAction {
@@ -1059,8 +1056,10 @@ sub GeneralSpecificationsWidgetAJAX {
     my ( $Self, %Param ) = @_;
 
     my $LayoutObject = $Kernel::OM->Get('Kernel::Output::HTML::Layout');
+
     return $LayoutObject->Attachment(
         ContentType => 'text/html',
+        Charset     => 'utf-8',
         Content     => $Kernel::OM->Get('Kernel::Output::HTML::Statistics::View')->GeneralSpecificationsWidget( UserID => $Self->{UserID} ),
         Type        => 'inline',
         NoCache     => 1,

diff --git a/Kernel/Output/HTML/Layout.pm b/Kernel/Output/HTML/Layout.pm
@@ -1623,6 +1623,7 @@ basically the same thing as executing the formerly used template HTTPHeaders.tt
     );
 
 The cookies are also added here.
+The previously set headers are discarded.
 
 =cut
-Original file line number
+Diff line change
@@ Expand Up @@
         );
     The cookies are also added here.
+    The previously set headers are discarded.
     =cut
@@ Expand Down @@