Attachment 129596 Details for Bug 29837 – Bug 29837: Remove JS error during installer

[patch] Bug 29837: Remove JS error during installer

Bug-29837-Remove-JS-error-during-installer.patch (text/plain), 1.68 KB, created by Martin Renvoize (ashimema) on 2022-01-19 10:37:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2022-01-19 10:37:33 UTC

Size: 1.68 KB

patch

obsolete

>From 5815da4c8b873c0163868c16c6da8cc92190f15b Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Mon, 10 Jan 2022 10:35:40 +0100
>Subject: [PATCH] Bug 29837: Remove JS error during installer
>
>Uncaught ReferenceError: _ is not defined
>
>the _() function is called from calendar.inc, but calendar.inc is
> included before the definition of this function in
>installer-intranet-bottom.inc
>
>Test plan:
>Confirm that the JS error is gone
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> .../prog/en/includes/installer-intranet-bottom.inc              | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-intranet-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-intranet-bottom.inc
>index 3f1ca56a38..99b8da94ba 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-intranet-bottom.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-intranet-bottom.inc
>@@ -5,7 +5,6 @@
>         [% Asset.js("lib/jquery/jquery-ui-1.11.4.min.js") | $raw %]
>         [% Asset.js("lib/bootstrap/bootstrap.min.js") | $raw %]
>         [% Asset.js("lib/jquery/plugins/jquery.validate.min.js") | $raw %]
>-        [% INCLUDE 'calendar.inc' %]
>         
>         <script>
>             function _(s) { return s } // dummy function for gettext
>@@ -20,6 +19,7 @@
>             });
>         </script>
>         
>+        [% INCLUDE 'calendar.inc' %]
>         [% jsinclude | $raw # Parse the page template's JavaScript block if necessary %]
>     </body>
> </html>
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 29837: 129241 | 129249 | 129596