[koha-commits] main Koha release repository branch 3.20.x updated. v3.20.01-64-g606b39b

Git repo owner gitmaster at git.koha-community.org
Tue Jul 14 10:43:07 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.20.x has been updated
       via  606b39b789d89ce90ffe0136b355e695d98383ee (commit)
       via  9dae698bb926866cab15cf61c76fc3e124d35e24 (commit)
       via  833e532597dc3ffa34495554ce06599dfd9e417c (commit)
       via  40bebca747eb52b64eb28f19d0834be0529673cc (commit)
      from  ce9b5d8904c0d46350418ed2252fd06910c01b8c (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 606b39b789d89ce90ffe0136b355e695d98383ee
Author: Mirko Tietgen <mirko at abunchofthings.net>
Date:   Thu Jun 25 15:38:42 2015 +0200

    Bug 14453: (followup) Fix shipped XSLT files
    
    Make the shipped XSLTs for authorities (MARC21 and UNIMARC) the same as the generated version
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit fbe25b1d8e1806768b04d829bd9fc1a05f4861cf)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 9dae698bb926866cab15cf61c76fc3e124d35e24
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Wed Jun 24 16:06:05 2015 +0200

    Bug 14453: kohaidx is missing for id in authority-koha-indexdefs.xml
    
    In authority-koha-indexdefs.xml, all tags use the namespace "kohaidx" except the tag "id".
    
    When re-generating authority-zebra-indexdefs.xsl, the line :
      <xslo:variable name="idfield" select="normalize-space(marc:controlfield[@tag='001'])"/>
    is modified :
      <xslo:variable name="idfield" select="normalize-space()"/>
    This is an error.
    
    This patch adds kohaidx namespace to correct.
    
    Test plan :
    - Without patch
    - go to etc/zebradb/marc_defs/marc21/authorities/
    - run : xslproc xsltproc ../../../xsl/koha-indexdefs-to-zebra.xsl authority-koha-indexdefs.xml > authority-zebra-indexdefs.xsl
    - read authority-zebra-indexdefs.xsl
    => the line has changed : <xslo:variable name="idfield" select="normalize-space()"/>
    - Apply patch
    - go to etc/zebradb/marc_defs/marc21/authorities/
    - run : xslproc xsltproc ../../../xsl/koha-indexdefs-to-zebra.xsl authority-koha-indexdefs.xml > authority-zebra-indexdefs.xsl
    - read authority-zebra-indexdefs.xsl
    => the line has not changed
    (same for unimarc flavor)
    
    Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    As Mirko mentioned, the xslt's now generate the facet-processing templates in
    the authority xslt's too. They are harmless because we don't define facets
    for authority records. If we did, it would be harmless too.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 2365537eea9d5cd6526843b1cd0c2152a6def06c)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 833e532597dc3ffa34495554ce06599dfd9e417c
Author: Winona Salesky <wsalesky at gmail.com>
Date:   Wed Jun 3 22:46:23 2015 -0400

    Bug 14326: XSLT Syntax error in MARC21slimOPACResults.xsl
    
    Test Plan:
    1) Apply this patch
    2) Ensure you are using the default XSLT setting for the staff and opac  record details
    3) Perform an opac search check "Availability" for expected display values.
    5) Note this patch corrects invalid syntax in xslt, there should be no visable changes to the results page.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 058b50de5b09ee2ba3efc953b9846bc79d712c31)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 40bebca747eb52b64eb28f19d0834be0529673cc
Author: Indranil Das Gupta <indradg at l2c2.co.in>
Date:   Mon May 4 18:55:15 2015 +0530

    Bug 14135: Adds 'Free' to variabletypes in systempreferences.tt
    
    The 'Local Use' system preference addition/modification template provides the following options against "Variable Type" - Choice, YesNo, Integer, Textarea, Float, Themes, Languages, Upload or ClassSource.
    
    There is no option presented for "Free" which seems to be the most
    used variable type out-of-the-box (i.e. INTRAdidyoumean,
    OPACdidyoumean, UsageStatsID and UsageStatsLastUpdateTime)
    
    This trivial patch proposes to modify the systempreferences.tt
    and add the option 'Free' to the list offered to users.
    
    Test Plan
    =========
    
    1/ Go to Home > Administration > System preferences > Local use
    2/ Click on 'New preference'.
    3/ In the fieldset 'Koha Internal', the variable types offered
       are Choice, YesNo, Integer, Textarea, Float, Themes,
       Languages, Upload or ClassSources.
    4/ Clicking on 'Choice' should set the 'preftype' field as
       'Choice'.
    5/ Apply this patch.
    6/ Refresh the page.
    7/ The variable types list should read - "Free, Choice, YesNo,
       Integer, Textarea, Float, Themes, Languages, Upload or
       ClassSources".
    8/ Clicking on 'Free' should set the 'preftype' field as 'Free'.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    NOTE: Discovered that there is no validation on the type field.
          However, that is beyond the scope of this bug.
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 9f008a102415c8b71a1f4a976bc15691c2663b5c)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 .../marc_defs/marc21/authorities/authority-koha-indexdefs.xml        |    2 +-
 .../marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl       |    2 ++
 .../marc_defs/unimarc/authorities/authority-koha-indexdefs.xml       |    2 +-
 .../marc_defs/unimarc/authorities/authority-zebra-indexdefs.xsl      |    2 ++
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt   |    2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl     |    2 +-
 6 files changed, 8 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list