Bugzilla – Attachment 75613 Details for
Bug 20761
Advanced Cataloging Editor - Rancor - Some js files are not fetched using Asset
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 20761: Fix some js includes in rancor
Bug-20761-Fix-some-js-includes-in-rancor.patch (text/plain), 2.38 KB, created by
Katrin Fischer
on 2018-05-28 21:18:12 UTC
(
hide
)
Description:
Bug 20761: Fix some js includes in rancor
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2018-05-28 21:18:12 UTC
Size:
2.38 KB
patch
obsolete
>From 06551ae446429289fab317173cbba75f6e2d7bd0 Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Sun, 13 May 2018 01:44:28 +0000 >Subject: [PATCH] Bug 20761: Fix some js includes in rancor > >To test: >1 - Load the advanced cataloging editor >2 - Inspect the network tab in your browser (F12) >3 - Note failure to load 'cataloging_.js' >4 - Note some other scripts don't have versioning >5 - Apply patch >6 - Reload page >7 - Note cataloging.js loads with version number >8 - Note more js files have versioning > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc | 8 ++++---- > koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt | 4 ++-- > 2 files changed, 6 insertions(+), 6 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc >index 68a168f..2a0e050 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc >@@ -1,7 +1,7 @@ >-<script src="[% interface %]/lib/codemirror/codemirror-compressed.js"></script> >-<script src="[% interface %]/lib/filesaver.js"></script> >-<script src="[% interface %]/lib/koha/cateditor/marc-mode.js"></script> >-<script src="[% interface %]/lib/require.js"></script> >+[% Asset.js("lib/codemirror/codemirror-compressed.js") %] >+[% Asset.js("lib/filesaver.js") %] >+[% Asset.js("lib/koha/cateditor/marc-mode.js") %] >+[% Asset.js("lib/require.js") %] > <script> > var authInfo = { > [%- FOREACH authtag = authtags -%] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >index 5937800..8abcdc5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >@@ -6,8 +6,8 @@ > [% Asset.css("css/datatables.css") %] > [% Asset.css("lib/codemirror/codemirror.css") %] > [% Asset.css("css/humanmsg.css") %] >-<script src="[% interface %]/lib/jquery/plugins/humanmsg.js" type="text/javascript"></script> >-<script src="[% interface %]/[% theme %]/js/cataloging_[% KOHA_VERSION %].js" type="text/javascript"></script> >+[% Asset.js("js/cataloging.js") %] >+[% Asset.js("lib/jquery/plugins/humanmsg.js") %] > [% IF ( bidi ) %] > [% Asset.css("css/right-to-left.css") %] > [% END %] >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 20761
:
75292
|
75613
|
75619