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

Jump to bottom

SectorNordAG: Fixed format of file content in AdminPackageManager's ViewDiff mask #486

Merged
merged 2 commits into from Nov 6, 2023
Merged

SectorNordAG: Fixed format of file content in AdminPackageManager's ViewDiff mask #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb79fd9
Added <pre> tag to allow string to displayed in its original format
ZTrotter Aug 21, 2023
3a71bb0
BugFix: Changed order of elements
ZTrotter Aug 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions Kernel/Modules/AdminPackageManager.pm
View file
Open in desktop
Expand Up @@ -139,6 +139,7 @@ sub Run {
if ($Content) {
$MainObject->Require('Text::Diff');
my $Diff = Text::Diff::diff( \$File, $Content, { STYLE => 'OldStyle' } );
$Kernel::OM->Get('Kernel::System::Encode')->EncodeInput( \$Diff );
NiklasSchmitt marked this conversation as resolved.
Show resolved Hide resolved
$LayoutObject->Block(
Name => "FileDiff",
Data => {
Expand Down
4 changes: 3 additions & 1 deletion Kernel/Output/HTML/Templates/Standard/AdminPackageManager.tt
View file
Open in desktop
Expand Up @@ -829,7 +829,9 @@
</h2>
</div>
<div class="Content">
<div class="code-container"><code>[% Data.Diff | html %]</code></div>
<div class="code-container">
<pre><code>[% Data.Diff | html %]</code></pre>
</div>
</div>
</div>
</div>
Expand Down