From 993cbc15f8d1e068619e8cf44bcdb028621ddb73 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 25 Jun 2013 12:46:04 -0400 Subject: [PATCH] [PASSED QA] Bug 10475 - Item form in acquisition not hiding subfields properly Subfields hidden in your ACQ framework leave a gap where they used to be in the item entry form when adding an item to an order. This patch makes the same change made by 7116 to services/itemrecorddisplay.tt to correct the problem. To test: - Edit your ACQ framework and set some item subfields to hidden in the editor. - Set your AcqCreateItem system preference to "when placing an order." - Add a title to an existing basket from an existing record. The item entry form should display correctly with your hidden subfields hidden. No whitespace should be left behind where the subfields were hidden. Also changed: Invalid "size" attributes on hidden form fields in neworderempty.tt, stray . Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Works nicely, passes all tests and QA script. Thx Owen! --- .../prog/en/modules/acqui/neworderempty.tt | 31 ++++++++++---------- .../prog/en/modules/services/itemrecorddisplay.tt | 8 +++-- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt index 87cfa8a..3a24e6d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -242,7 +242,7 @@ $(document).ready(function()
  1. [% IF ( biblionumber ) %] Title - [% title |html %] + [% title |html %] [% ELSE %] @@ -251,7 +251,7 @@ $(document).ready(function()
  2. [% IF ( biblionumber ) %] Author: - [% author %] + [% author %] [% ELSE %] @@ -260,7 +260,7 @@ $(document).ready(function()
  3. [% IF ( biblionumber ) %] Publisher: - [% publishercode %] + [% publishercode %] [% ELSE %] @@ -269,7 +269,7 @@ $(document).ready(function()
  4. [% IF ( biblionumber ) %] Edition: - [% editionstatement %] + [% editionstatement %] [% ELSE %] @@ -279,7 +279,7 @@ $(document).ready(function()
  5. [% IF ( biblionumber ) %] Publication year: - [% publicationyear %] + [% publicationyear %] [% ELSE %] @@ -288,7 +288,7 @@ $(document).ready(function()
  6. [% IF ( biblionumber ) %] ISBN: - [% isbn %] + [% isbn %] [% ELSE %] @@ -298,7 +298,7 @@ $(document).ready(function()
  7. [% IF ( biblionumber ) %] EAN: - [% ean %] + [% ean %] [% ELSE %] @@ -308,13 +308,12 @@ $(document).ready(function()
  8. [% IF ( biblionumber ) %] Series: - [% seriestitle %] + [% seriestitle %] [% ELSE %] [% END %]
  9. - [% UNLESS ( biblionumber ) %] [% IF ( itemtypeloop ) %]
  10. @@ -395,7 +394,7 @@ $(document).ready(function()
  11. [% IF ( close ) %] Quantity: - [% quantity %] + [% quantity %] [% ELSE %] [% IF (AcqCreateItemOrdering) %] @@ -418,7 +417,7 @@ $(document).ready(function()
  12. [% IF ( close ) %] Fund: - [% Budget_name %] + [% Budget_name %] [% ELSE %] [% currency %] + [% currency %] [% ELSE %] [% listprice %] + [% listprice %] [% ELSE %] @@ -472,9 +471,9 @@ $(document).ready(function()
  13. [% IF ( close ) %] Tax rate: - [% gstrate %]% + [% gstrate %]% [% ELSE %] - + [% rrp %] + [% rrp %] [% ELSE %] (adjusted for [% cur_active %]) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/services/itemrecorddisplay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/services/itemrecorddisplay.tt index 005a0a8..5637276 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/services/itemrecorddisplay.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/services/itemrecorddisplay.tt @@ -1,7 +1,11 @@
      [% FOREACH iteminfo IN iteminformation %] -
    1. -
      + [% IF ( iteminfo.hidden ) %] +
    2. + [% ELSE %] +
    3. + [% END %] +
      [% IF (iteminfo.mandatory) %] [% ELSE %] -- 1.7.9.5