[koha-commits] main Koha release repository branch 3.16.x updated. v3.16.09-8-g40b2587

Git repo owner gitmaster at git.koha-community.org
Wed Apr 22 12:25:56 CEST 2015


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 3.16.x has been updated
       via  40b2587164d8b40294aeabebc1412000ef64d4da (commit)
       via  09f2ca6d44b4c49e48935b48528f1bba19f7d236 (commit)
       via  29df56ab9516c8fb02528731f4f29df247271254 (commit)
      from  7f504acc13a361ba93504917498ae955b82ed430 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 40b2587164d8b40294aeabebc1412000ef64d4da
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Thu Dec 11 09:50:38 2014 +0100

    Bug 13268: the size should not be emptied in pl script
    
    It duplicates what the first patch does.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 09f2ca6d44b4c49e48935b48528f1bba19f7d236
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Mon Nov 17 16:32:20 2014 +0100

    Bug 13268 - biblioitems.size value not correctly displayed (more)
    
    Bug partially corrected by Bug 11357.
    
    The size column in biblioitems is a bit problematic when used in TT, because instead of the size value from the biblio column it will give you the size of the variable or current loop.
    
    It's currently used in the templates like opac-topissues.tt :
    [% IF results_loo.size %][% results_loo.size %][% END %]
    
    This patch corrects by using item() TT method.
    See http://stackoverflow.com/questions/2311303/how-can-i-handle-hash-keys-containing-illegal-identifier-characters-in-template.
    
    Test plan :
    - Be sure there is a mapping between a MARC field and biblioitems.size
    - Create a record A with biblioitems.size defined : like "10x12"
    - Create a record B with no value in biblioitems.size
    - Check each modified page :
    => Without this patch : you see a number (loop size) for both records
    => With this patch : you only see the correct value for A and nothing for B
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 29df56ab9516c8fb02528731f4f29df247271254
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Thu Jun 19 14:47:15 2014 +0200

    Bug 11357 - biblioitems.size value not correctly displayed in list emails sent from OPAC and intranet
    
    The size column in biblioitems is a bit problematic when used in TT, because instead of the size value from the biblio column it will give you the size of the variable.
    
    It's currently used in the templates for sending shelves from OPAC and intranet and maybe also in other places:
    
    [% END %]
       [% IF BIBLIO_RESULT.size %]
       , [% BIBLIO_RESULT.size %]
    [% END %]
    
    This patch corrects by using item() TT method.
    See http://stackoverflow.com/questions/2311303/how-can-i-handle-hash-keys-containing-illegal-identifier-characters-in-template.
    
    Test plan :
    In each display :
    => Without this patch you see biblioitems.pages and then a number
    => With this patch you only see biblioitems.pages
    
    - Create a record with biblioitems.pages defined (like "12p") but without biblioitems.size defined
    Same for OPAC and intranet :
    - Add it to the cart
    - Open the cart
    - Check the "Title" column
    - Click on "More Details"
    - Check the "Details" row
    - Send the basket via email and check the result
    - Add to a list
    - Send the list via email and check the result
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Works well!!
    Tested on staff & opac, cart & list.
    No koha-qa errors
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Passes QA script and tests.

-----------------------------------------------------------------------

Summary of changes:
 cataloguing/addbooks.pl                                        |    3 ---
 koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt       |    8 ++++----
 koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt   |    4 ++--
 .../intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt      |    2 +-
 .../intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt      |    2 +-
 .../intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt  |    6 +++---
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt        |    6 +++---
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt    |    4 ++--
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt     |    6 +++---
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt       |    2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt     |    2 +-
 11 files changed, 21 insertions(+), 24 deletions(-)


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list