Koha-community/Koha
15
7
Fork 0
Code Issues Releases Wiki Activity

Bug 30388: Fix some errors in the template for ordering from a MARC file

Browse source 
This patch fixes a few markup errors in the addorder2709 template. The
modal dialog markup is corrected and moved out of the loop of records so
that it doesn't create repeating id attributes. Obsolete CSS is removed,
fixing the width of the MARC preview modal.

The calendar include is added, fixing a Flatpickr error in the console.

Double ID attributes are removed from the Statistics 1 and Statistics 2
fields.

To test, apply the patch and test the process of adding an order to a
basket from a staged MARC file. Test in particular:

 - The MARC and Card previews
 - The "Date acquired" field under the "Item information" tab should
   trigger a Flatpickr widget.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Owen Leonard 2022-03-28 17:28:50 +00:00 committed by Tomas Cohen Arazi
parent cec9ba5283
commit 5f92146588
Signed by: tomascohen
GPG key ID: 0A272EA1B2F3C15F
1 changed files with 51 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
View file

@ -10,7 +10,7 @@
Batch list
[% END %] &rsaquo; Order staged MARC records &rsaquo; Acquisitions &rsaquo; Koha
</title>
<style>#dataPreview { width : 80%; } @media (max-width: 767px) { #dataPreview { margin: 0; width : auto; } }</style>
<style>@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 %]
@ -18,6 +18,7 @@
[% Asset.js("js/acq.js") | $raw %]
[% Asset.js("js/funds_sorts.js") | $raw %]
[% Asset.js("js/addorderiso2709.js") | $raw %]
[% INCLUDE 'calendar.inc' %]
</head>
<body id="acq_addorderiso2709" class="acq">
@ -180,11 +181,11 @@
</li>
<li class="sort1">
<label for="sort1_record_[% biblio.import_record_id | html %]">Statistic 1: </label>
<input id="sort1_record_[% biblio.import_record_id | html %]" type="text" id="sort1" size="20" name="sort1" value="[% biblio.sort1 | html %]" />
<input id="sort1_record_[% biblio.import_record_id | html %]" type="text" size="20" name="sort1" value="[% biblio.sort1 | html %]" />
</li>
<li class="sort2">
<label for="sort2_record_[% biblio.import_record_id | html %]">Statistic 2: </label>
<input id="sort2_record_[% biblio.import_record_id | html %]" type="text" id="sort2" size="20" name="sort2" value="[% biblio.sort2 | html %]" />
<input id="sort2_record_[% biblio.import_record_id | html %]" type="text" size="20" name="sort2" value="[% biblio.sort2 | html %]" />
</li>
</ol>
</div>
@ -319,12 +320,14 @@
</div>
</fieldset> <!-- .biblio.unselected.rows -->
<div id="dataPreview" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="dataPreviewLabel" aria-hidden="true">
<div class="modal-dialog">
[% END # /FOREACH biblio %]
<div class="modal" id="dataPreview" tabindex="-1" role="dialog" aria-labelledby="dataPreviewLabel">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
<h3 id="dataPreviewLabel">MARC preview</h3>
<button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span
aria-hidden="true">&times;</span></button>
<h4 id="dataPreviewLabel">MARC preview</h4>
</div>
<div class="modal-body">
<div id="loading"> <img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /> Loading </div>
@ -333,9 +336,8 @@
<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>
</div>
</div> <!-- /.modal-content -->
</div> <!-- /modal-dialog -->
</div> <!-- /.modal-dialog -->
</div> <!-- /#dataPreview -->
[% END # /FOREACH biblio %]
</div> <!-- /#records_to_import -->
<div id="items_info">
@ -402,10 +404,11 @@
<!-- origquantityrec only here for javascript compatibility (additem.js needs it, useless here, useful when receiveing an order -->
<input id="origquantityrec" readonly="readonly" type="hidden" name="origquantityrec" value="1" />
</li>
<li>
[% IF ( close ) %]
<li>
<span class="label">Fund: </span>
<input type="hidden" size="20" name="budget_id" id="budget_id" value="[% budget_id | html %]" />[% Budget_name | html %]
</li>
[% ELSE %]
<li>
<label for="all_currency">Currency:</label>
@ -435,7 +438,6 @@
<input type="checkbox" id="all_showallbudgets" />
</li>
[% END #/IF close %]
</li>
<li>
<label for="all_order_internalnote">Internal note: </label>
<textarea id="all_order_internalnote" cols="30" rows="3" name="all_order_internalnote"></textarea>