From b4066b480f9671e686153c309227e03c9c50e559 Mon Sep 17 00:00:00 2001 From: Andrew Nugged Date: Sun, 22 May 2022 21:32:36 +0300 Subject: [PATCH] Bug 20447: (QA follow-up) addholding.tt rebase compatibility fixes --- .../prog/en/modules/cataloguing/addholding.tt | 441 ++++++++++++------ 1 file changed, 300 insertions(+), 141 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addholding.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addholding.tt index 278082107b..15008c6117 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addholding.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addholding.tt @@ -4,20 +4,24 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Cataloging › [% title | html %] [% IF ( author ) %] by [% author | html %][% END %] (Record #[% biblionumber | html %]) › Holdings [% INCLUDE 'doc-head-close.inc' %] +[% INCLUDE 'calendar.inc' %] [% Asset.js("lib/hc-sticky.js") | $raw %] +[% INCLUDE 'select2.inc' %] + [% Asset.js("js/cataloging.js") | $raw %] [% Asset.js("js/browser.js") | $raw %] -[% Asset.css("css/addholding.css") | $raw %] -[% INCLUDE 'select2.inc' %] - - - - +[% Asset.css("css/addholding.css") | $raw %] + +
Loading, please wait...
@@ -389,12 +528,24 @@ [% INCLUDE 'header.inc' %] - +
@@ -440,10 +591,10 @@
- [% IF ( BIG_LOOP.size > 1 ) %] + [% IF ( BIG_LOOP && BIG_LOOP.size > 1 ) %]
    [%- FOREACH BIG_LOO IN BIG_LOOP -%] [% IF loop.first %] @@ -532,17 +683,17 @@ [% previous = "" %] [% FOREACH innerloo IN BIG_LOO.innerloop %] [% IF ( innerloo.tag ) %] - [% IF innerloo.tag != previous %] - [% IF previous != "" %] -
- [% END %] - [% previous = innerloo.tag %] - [% IF ( innerloo.repeatable ) %] -
    - [% ELSE %] -
      - [% END %] + [% IF innerloo.tag != previous %] + [% IF previous != "" %] +
    + [% END %] + [% previous = innerloo.tag %] + [% IF ( innerloo.repeatable ) %] +
      + [% ELSE %] +
        [% END %] + [% END %] [% IF ( innerloo.repeatable ) %]
      • [% ELSE %] @@ -553,7 +704,7 @@ [% innerloo.tag | html %] [% ELSE %] [% innerloo.tag | html %] - [% IF marcflavour != 'NORMARC' %] ?[% END %] +  ? [% END %] [% IF ( innerloo.fixedfield ) %] @@ -610,85 +761,93 @@ [% FOREACH subfield_loo IN innerloo.subfield_loop %]
      • +
        + +
        [% UNLESS advancedMARCEditor %] - [% IF ( subfield_loo.fixedfield ) %] -
        • [% END # /FOREACH subfield_loop %]
      [% END %] - [% END %] + [% END # /FOREACH BIG_LOO.innerloop %]
- [% END %] + [% END # /FOREACH BIG_LOOP %]
-- 2.37.2