Attachment 72701 Details for Bug 19709 – Bug 19709 (follow-up) Add KOHA_VERSION variables to js includes

[patch] Bug 19709 (follow-up) Add KOHA_VERSION variables to js includes

Bug-19709-follow-up-Add-KOHAVERSION-variables-to-j.patch (text/plain), 6.61 KB, created by Owen Leonard on 2018-03-12 14:51:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2018-03-12 14:51:54 UTC

Size: 6.61 KB

patch

obsolete

>From c50d0875a0c2cd4cd891230529679fa878397a93 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Mon, 12 Mar 2018 14:43:08 +0000
>Subject: [PATCH] Bug 19709 (follow-up) Add KOHA_VERSION variables to js
> includes
>
>This follow-up adds the new [%i KOHA_VERSION %] variable to some
><script> paths which were previously missing it.
>
>To test, apply the patch and view each affected page. The page's
>corresponding menu item in the left-hand sidebar should be highlighted,
>indicating that the tool-menu JS file is loading correctly.
>
>- Tools -> Label creator
>- Tools -> Label creator -> Manage -> Label batches
>- Tools -> Label creator -> Manage -> Label batches -> Export batch
>- Tools -> Label creator -> Manage -> Layouts
>- Tools -> Label creator -> Manage -> Label templates
>- Tools -> Label creator -> Manage -> Printer profiles
>- Tools -> Quick spine label creator
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt    | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt   | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt  | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt          | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt         | 4 ++--
> koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt     | 2 +-
> 7 files changed, 8 insertions(+), 8 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
>index a4fe925..4b39680 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
>@@ -140,7 +140,7 @@
> [% MACRO jsinclude BLOCK %]
>     [% INCLUDE 'greybox.inc' %]
>     [% INCLUDE 'datatables.inc' %]
>-    <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu.js"></script>
>+    <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script>
>     <script type="text/javascript">
>         function DeleteConfirm() {
>             var msg = _("Are you sure you want to delete batch %s?").format("[% batch_id %]");
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt
>index f5bdd4c..50ef3a5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt
>@@ -188,7 +188,7 @@
>         </div>
> 
> [% MACRO jsinclude BLOCK %]
>-    <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu.js"></script>
>+    <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script>
>     <script type="text/JavaScript">
>             $(document).ready(function() {
>                 $("input[name='layout_choice']").change( function() { layout_method() } );
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt
>index c542112..28fe5d6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt
>@@ -116,7 +116,7 @@
>             </div>
> 
> [% MACRO jsinclude BLOCK %]
>-    <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu.js"></script>
>+    <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script>
>     <script type="text/javascript">
>         $(document).ready(function(){
>             var selectedUnit = $("#units option:selected").attr("value");
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt
>index a350945..1f64c2f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt
>@@ -152,7 +152,7 @@
>     </div>
> 
> [% MACRO jsinclude BLOCK %]
>-    <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu.js"></script>
>+    <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script>
>     <script type="text/javascript">
>         //<![CDATA[
>         $(document).ready(function(){
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt
>index c539d36..eb35768 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt
>@@ -32,7 +32,7 @@
>         </div>
> 
> [% MACRO jsinclude BLOCK %]
>-    <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu.js"></script>
>+    <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script>
> [% END %]
> 
> [% INCLUDE 'intranet-bottom.inc' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt
>index 4c10884..bef9beb 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt
>@@ -101,8 +101,8 @@
>         </div>
> 
> [% IF ( IntranetUserJS ) %]
>-    <script type="text/javascript" src="[% interface %]/lib/jquery/jquery-2.2.3.min.js"></script>
>-    <script type="text/javascript" src="[% interface %]/lib/jquery/jquery-migrate-1.3.0.min.js"></script>
>+    <script type="text/javascript" src="[% interface %]/lib/jquery/jquery-2.2.3.min_[% KOHA_VERSION %].js"></script>
>+    <script type="text/javascript" src="[% interface %]/lib/jquery/jquery-migrate-1.3.0.min_[% KOHA_VERSION %].js"></script>
>     <script type="text/javascript">
>         [% IntranetUserJS %]
>         function Done() {
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt
>index 6e123c0..188402a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt
>@@ -33,7 +33,7 @@
> </div>
> 
> [% MACRO jsinclude BLOCK %]
>-    <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu.js"></script>
>+    <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script>
> [% END %]
> 
> [% INCLUDE 'intranet-bottom.inc' %]
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 19709: 69418 | 70432 | 71557 | 72439 | 72625 | 72701 | 73021 | 75155 | 75253 | 76163