Bugzilla – Attachment 105178 Details for
Bug 25473
Can't add order from MARC file, save button does nothing
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 25473: Move JavaScript out of the footer of addorderiso2709.tt
Bug-25473-Move-JavaScript-out-of-the-footer-of-add.patch (text/plain), 3.29 KB, created by
Katrin Fischer
on 2020-05-21 11:16:34 UTC
(
hide
)
Description:
Bug 25473: Move JavaScript out of the footer of addorderiso2709.tt
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2020-05-21 11:16:34 UTC
Size:
3.29 KB
patch
obsolete
>From c4320dfb10237335e58204fa5ccb5850e4c169f8 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Thu, 14 May 2020 11:47:51 +0000 >Subject: [PATCH] Bug 25473: Move JavaScript out of the footer of > addorderiso2709.tt > >This patch undoes the move of the JavaScript block to the footer made in >Bug 22734. The item information tab can include embedded JavaScript for >cataloging plugins, and these don't currently work with JS in the >footer. > >To test, apply the patch and test the JavaScript driven features of the >"Add to basket from a staged file" page: > >- Acquisitions -> Vendor -> Basket -> Add to basket from a staged file > - MARC and Card previews, select all/clear all > - Item information tab: Cataloging plugins for fields like > date acquired, barcode > - Default accounting details tab: Show inactive control > >Signed-off-by: Nick Clemens <nick@bywatersolutions.com> > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > .../prog/en/modules/acqui/addorderiso2709.tt | 30 ++++++++++------------ > 1 file changed, 13 insertions(+), 17 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >index 80d6cba40c..e30734d7ae 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >@@ -2,7 +2,6 @@ > [% USE Asset %] > [% USE KohaDates %] > [% USE Branches %] >-[% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › Order staged MARC records > [% IF ( batch_details ) %] >@@ -13,6 +12,19 @@ > </title> > <style>#dataPreview { width : 80%; } @media (max-width: 767px) { #dataPreview { margin: 0; width : auto; } }</style> > [% INCLUDE 'doc-head-close.inc' %] >+[%# As long as cataloging plugins rely on <script> tags added inline, JS must be in the header %] >+[% Asset.js("js/acquisitions-menu.js") | $raw %] >+[% INCLUDE 'datatables.inc' %] >+[% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %] >+[% Asset.js("js/acq.js") | $raw %] >+[% Asset.js("js/funds_sorts.js") | $raw %] >+[% Asset.js("js/addorderiso2709.js") | $raw %] >+<script> >+ var ERR_NO_RECORD_SELECTED = _("There is no record selected"); >+ var ERR_INVALID_QUANTITY = _("quantity values are not filled in or are not numbers"); >+ var ERR_FUNDS_MISSING = _("Some budgets are not defined in item records"); >+ var MSG_LOADING = _("Loading"); >+</script> > </head> > > <body id="acq_addorderiso2709" class="acq"> >@@ -432,20 +444,4 @@ > </div> [% # /div.col-sm-6 %] > </div> [% # /div.row %] > >- >-[% MACRO jsinclude BLOCK %] >- [% Asset.js("js/acquisitions-menu.js") | $raw %] >- [% INCLUDE 'datatables.inc' %] >- [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %] >- [% Asset.js("js/acq.js") | $raw %] >- [% Asset.js("js/funds_sorts.js") | $raw %] >- [% Asset.js("js/addorderiso2709.js") | $raw %] >- <script> >- var ERR_NO_RECORD_SELECTED = _("There is no record selected"); >- var ERR_INVALID_QUANTITY = _("quantity values are not filled in or are not numbers"); >- var ERR_FUNDS_MISSING = _("Some budgets are not defined in item records"); >- var MSG_LOADING = _("Loading"); >- </script> >-[% END %] >- > [% INCLUDE 'intranet-bottom.inc' %] >-- >2.11.0
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 25473
:
104878
|
105174
| 105178