[koha-commits] main Koha release repository branch 17.11.x updated. v17.11.10-50-g5febaef

[Git repo owner]

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, 17.11.x has been updated
       via  5febaef09f56059875a7bb4b0518903e41333d3a (commit)
       via  2755a664707b2111589aa0726f56eb7bb14a2fde (commit)
      from  6830a61918a8ece7a3254cfe3473c48a6630f284 (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 5febaef09f56059875a7bb4b0518903e41333d3a
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Fri Feb 2 14:34:34 2018 +0100

    Bug 20131: Inventory optional filters correct "For loan" addition
    
    In inventory, optional filters are build from authorize values categories used for items.notforloan, items.itemlost, items.withdrawn and items.damaged.
    
    The bug is that description of value 0 is always "For loan".
    This seems to be only for "notforloan".
    
    Second bug is that if a description exists for "notforloan" value 0, it is not used.
    
    This patch corrects by adding "For loan" only for "notforloan" authorized values and if there is no 0 value.
    It changes the description added by code from "ignore" to a more unlikly user defined "__IGNORE__".
    
    Test plan:
    1) Make sure you have authorized values defined on items.notforloan, say "NFL" category, with at least a value and description but no 0 value
    2) Make sure you have authorized values defined on items.itemlost, say "LOST" category, with 0 = "Not lost" and 1 = "Lost"
    3) Go to inventory /cgi-bin/koha/tools/inventory.pl
    4) Without patch you see "For loan" on both items.notforloan and items.itemlost
    5) With patch you see "For loan" only in items.notforloan, you see for items.itemlost : "Not lost" and "Lost"
    6) Create in authorized values category "NFL" a value 0 with description "Available"
    7) Go to inventory /cgi-bin/koha/tools/inventory.pl
    8) Without patch you see "For loan" in items.notforloan for value 0
    9) With patch you see "Available" in items.notforloan for value 0
    
    Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 8d9284668c6de2d5fbfc4079a8b0516ba1645876)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit a9aa1bd1e43a871a813de1e2e97005567afa589c)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 2755a664707b2111589aa0726f56eb7bb14a2fde
Author: Baptiste Wojtkowski <baptiste.wojtkowski at biblibre.com>
Date:   Tue May 23 08:54:00 2017 +0000

    Bug 18655: Correct the choose link in unimarc_field_210c value builder
    
    - Link 'choose' is now a button.
    - It doesn't call directly javascript anymore (use of listener).
    - field to load stored in html on the page (less escaping needed).
    
    Test plan :
    1) Use UNIMARC catalog
    2) Define unimarc_field_210c value builder on 210$c
    3) Define an autority type EDITORS with heading on 200$b
    4) Create an autority of this type with a single quote in heading, ie : l'avenir
    5) Index this new autority
    6) Edit a biblio record and launch 210$c value builder
    7) Search for new autority
    8) Click on 'Choose'
    => Heading should be pasted in 210$c
    
    Signed-off-by: David Nind <david at davidnind.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 9965aa43e15aaa63fd8999daa98618d20698e89b)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit b8ad6a6532c236e473d548ad910d920ef1516ecf)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 .../cataloguing/value_builder/unimarc_field_210c.tt       |   13 ++++++++++---
 .../intranet-tmpl/prog/en/modules/tools/inventory.tt      |    4 ++--
 tools/inventory.pl                                        |    2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
main Koha release repository