From ee275e16c4e5af58717530456336677113f9ab79 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Mon, 18 Oct 2021 14:53:05 +0200
Subject: [PATCH] Bug 29263: (bug 24387 follow-up) Fix 'Cancel' link when
 editing a html custom

When editing content that is a html customization, the 'cancel' link
should redirect to the html custom list, not the 'news' list.

Test plan:
Create or edit a html customization, click the 'Cancel' link
=> You should be redirected to the html custom list

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
---
 .../intranet-tmpl/prog/en/modules/tools/additional-contents.tt      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
index 2f74dfbcfc..459c072608 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
@@ -166,7 +166,11 @@
         <div class="btn-group">
             <button class="btn btn-default" id="submit_form"><i class="fa fa-save"></i> Save</button>
         </div>
-        <a class="btn btn-default cancel" href="/cgi-bin/koha/tools/additional-contents.pl"><i class="fa fa-remove"></i> Cancel</a>
+        [% IF category == 'news' %]
+            <a class="btn btn-default cancel" href="/cgi-bin/koha/tools/additional-contents.pl"><i class="fa fa-remove"></i> Cancel</a>
+        [% ELSE %]
+            <a class="btn btn-default cancel" href="/cgi-bin/koha/tools/additional-contents.pl?category=html_customizations"><i class="fa fa-remove"></i> Cancel</a>
+        [% END %]
     </div>
 
     <form id="add_additional_content" method="post" action="/cgi-bin/koha/tools/additional-contents.pl" class="validate">
-- 
2.11.0