Bugzilla – Attachment 19283 Details for
Bug 10475
Item form in acquisition not hiding subfields properly
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 10475 - Item form in acquisition not hiding subfields properly
Bug-10475---Item-form-in-acquisition-not-hiding-su.patch (text/plain), 10.54 KB, created by
Chris Cormack
on 2013-06-29 10:08:50 UTC
(
hide
)
Description:
Bug 10475 - Item form in acquisition not hiding subfields properly
Filename:
MIME Type:
Creator:
Chris Cormack
Created:
2013-06-29 10:08:50 UTC
Size:
10.54 KB
patch
obsolete
>From 0b3fcfe9ad3020cad634053b1bd78d17c7f6d88f Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 25 Jun 2013 12:46:04 -0400 >Subject: [PATCH] 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 </li>. > >Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> >--- > .../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() > <ol><li> > [% IF ( biblionumber ) %] > <span class="label">Title</span> >- <input type="hidden" size="50" name="title" value="[% title |html %]" /> <span class="title">[% title |html %]</span> >+ <input type="hidden" name="title" value="[% title |html %]" /> <span class="title">[% title |html %]</span> > [% ELSE %] > <label for="entertitle" class="required">Title: </label> > <input type="text" id="entertitle" size="50" name="title" value="[% title |html %]" /> >@@ -251,7 +251,7 @@ $(document).ready(function() > <li> > [% IF ( biblionumber ) %] > <span class="label">Author: </span> >- <input type="hidden" size="50" name="author" id="author" value="[% author %]" />[% author %] >+ <input type="hidden" name="author" id="author" value="[% author %]" />[% author %] > [% ELSE %] > <label for="author">Author: </label> > <input type="text" size="50" name="author" id="author" value="[% author %]" /> >@@ -260,7 +260,7 @@ $(document).ready(function() > <li> > [% IF ( biblionumber ) %] > <span class="label">Publisher: </span> >- <input type="hidden" size="50" name="publishercode" id="publishercode" value="[% publishercode %]" />[% publishercode %] >+ <input type="hidden" name="publishercode" id="publishercode" value="[% publishercode %]" />[% publishercode %] > [% ELSE %] > <label for="publishercode"> Publisher: </label> > <input type="text" size="50" name="publishercode" id="publishercode" value="[% publishercode %]" /> >@@ -269,7 +269,7 @@ $(document).ready(function() > <li> > [% IF ( biblionumber ) %] > <span class="label">Edition: </span> >- <input type="hidden" size="20" name="editionstatement" id="editionstatement" value="[% editionstatement %]" />[% editionstatement %] >+ <input type="hidden" name="editionstatement" id="editionstatement" value="[% editionstatement %]" />[% editionstatement %] > > [% ELSE %] > <label for="editionstatement">Edition: </label> >@@ -279,7 +279,7 @@ $(document).ready(function() > <li> > [% IF ( biblionumber ) %] > <span class="label">Publication year: </span> >- <input type="hidden" size="10" name="publicationyear" id="publicationyear" value="[% publicationyear %]" />[% publicationyear %] >+ <input type="hidden" name="publicationyear" id="publicationyear" value="[% publicationyear %]" />[% publicationyear %] > [% ELSE %] > <label for="publicationyear">Publication year: </label> > <input type="text" size="10" name="publicationyear" id="publicationyear" value="[% publicationyear %]" /> >@@ -288,7 +288,7 @@ $(document).ready(function() > <li> > [% IF ( biblionumber ) %] > <span class="label">ISBN: </span> >- <input type="hidden" size="50" name="isbn" id="ISBN" value="[% isbn %]" />[% isbn %] >+ <input type="hidden" name="isbn" id="ISBN" value="[% isbn %]" />[% isbn %] > [% ELSE %] > <label for="ISBN">ISBN: </label> > <input type="text" size="50" name="isbn" id="ISBN" value="[% isbn %]" /> >@@ -298,7 +298,7 @@ $(document).ready(function() > <li> > [% IF ( biblionumber ) %] > <span class="label">EAN: </span> >- <input type="hidden" size="20" name="ean" id="EAN" value="[% ean %]" />[% ean %] >+ <input type="hidden" name="ean" id="EAN" value="[% ean %]" />[% ean %] > [% ELSE %] > <label for="EAN">EAN: </label> > <input type="text" size="20" name="ean" id="EAN" value="[% ean %]" /> >@@ -308,13 +308,12 @@ $(document).ready(function() > <li> > [% IF ( biblionumber ) %] > <span class="label">Series: </span> >- <input type="hidden" size="50" name="series" id="series" value="[% seriestitle %]" />[% seriestitle %] >+ <input type="hidden" name="series" id="series" value="[% seriestitle %]" />[% seriestitle %] > [% ELSE %] > <label for="series">Series: </label> > <input type="text" size="50" name="series" id="series" value="[% seriestitle %]" /> > [% END %] > </li> >- </li> > [% UNLESS ( biblionumber ) %] > [% IF ( itemtypeloop ) %] > <li> >@@ -395,7 +394,7 @@ $(document).ready(function() > <li> > [% IF ( close ) %] > <span class="label required">Quantity: </span> >- <input type="hidden" size="20" name="quantity" value="[% quantity %]" />[% quantity %] >+ <input type="hidden" name="quantity" value="[% quantity %]" />[% quantity %] > [% ELSE %] > <label class="required" for="quantity">Quantity: </label> > [% IF (AcqCreateItemOrdering) %] >@@ -418,7 +417,7 @@ $(document).ready(function() > <li> > [% IF ( close ) %] > <span class="label required">Fund: </span> >- <input type="hidden" size="20" name="budget_id" id="budget_id" value="[% budget_id %]" />[% Budget_name %] >+ <input type="hidden" name="budget_id" id="budget_id" value="[% budget_id %]" />[% Budget_name %] > [% ELSE %] > <label class="required" for="budget_id">Fund: </label> > <select id="budget_id" onchange="fetchSortDropbox(this.form)" size="1" name="budget_id"> >@@ -440,7 +439,7 @@ $(document).ready(function() > <li> > [% IF ( close ) %] > <span class="label">Currency: </span> >- <input type="hidden" size="10" name="currency" id="currency" value="[% currency %]" />[% currency %] >+ <input type="hidden" name="currency" id="currency" value="[% currency %]" />[% currency %] > [% ELSE %] > <label for="currency">Currency:</label> > <select name="currency" id="currency" onchange="updateCosts();"> >@@ -452,7 +451,7 @@ $(document).ready(function() > <li> > [% IF ( close ) %] > <span class="label">Vendor price: </span> >- <input type="hidden" size="20" name="listprice" id="listprice" value="[% listprice %]" />[% listprice %] >+ <input type="hidden" name="listprice" id="listprice" value="[% listprice %]" />[% listprice %] > [% ELSE %] > <label for="listprice">Vendor price: </label> > <input type="text" size="20" name="listprice" id="listprice" value="[% listprice %]" onchange="updateCosts()" /> >@@ -472,9 +471,9 @@ $(document).ready(function() > <li> > [% IF ( close ) %] > <span class="label">Tax rate: </span> >- <input type="hidden" size="20" name="gstrate" id="gstrate" value="[% gstrate %]" />[% gstrate %]% >+ <input type="hidden" name="gstrate" id="gstrate" value="[% gstrate %]" />[% gstrate %]% > [% ELSE %] >- <label for="gst">Tax rate: </label> >+ <label for="gstrate">Tax rate: </label> > <select name="gstrate" id="gstrate" onchange="updateCosts();"> > [% FOREACH gst IN gst_values %] > [% IF ( gst.option == gstrate ) %] >@@ -508,7 +507,7 @@ $(document).ready(function() > <li> > [% IF ( close ) %] > <span class="label">Replacement cost: </span> >- <input type="hidden" size="20" name="rrp" id="rrp" value="[% rrp %]" />[% rrp %] >+ <input type="hidden" name="rrp" id="rrp" value="[% rrp %]" />[% rrp %] > [% ELSE %] > <label for="rrp">Replacement cost: </label> > <input type="text" size="20" name="rrp" id="rrp" value="[% rrp %]" /> (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 @@ > <ol> > [% FOREACH iteminfo IN iteminformation %] >- <li> >- <div class="subfield_line" style="[% iteminfo.hidden %];" id="subfield[% iteminfo.serialid %][% iteminfo.countitems %][% iteminfo.subfield %][% iteminfo.random %]"> >+ [% IF ( iteminfo.hidden ) %] >+ <li style="[% iteminfo.hidden %];"> >+ [% ELSE %] >+ <li> >+ [% END %] >+ <div class="subfield_line" id="subfield[% iteminfo.serialid %][% iteminfo.countitems %][% iteminfo.subfield %][% iteminfo.random %]"> > [% IF (iteminfo.mandatory) %] > <label class="required">[% iteminfo.subfield %] - [% iteminfo.marc_lib %]</label> > [% ELSE %] >-- >1.7.10.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 10475
:
19052
|
19237
|
19283
|
19291