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, master has been updated
       via  3352d75bfeea1dd5d9d6e025b6884a190044003c (commit)
       via  36ee00ed952ed9081eeeca5e98fe006fbaa12db6 (commit)
       via  33bd28fb856d496370f7132171aa479c77b28af8 (commit)
       via  3eadb87fd86b2331d4ea58aa86f1810bbf952c89 (commit)
       via  5e4e26dd0f7516bd3dca4758bbc3c72e4b9723d5 (commit)
       via  484b8245af189edcaba64f191981cd5374237125 (commit)
       via  0f5d14f70792d5406857a81c415bc3f58cbd8b96 (commit)
       via  88ff22bb5a5d535893cf238ae784bb62a5b7d676 (commit)
      from  0c4112a200bfdcdbdba4ce7870aeced1f960cfd9 (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 3352d75bfeea1dd5d9d6e025b6884a190044003c
Author: Nick Clemens <>
Date:   Fri Jun 28 12:53:20 2019 +0000

    Bug 14549: POD and variable cleanup
    Signed-off-by: Chris Cormack <>
    Signed-off-by: Tomas Cohen Arazi <>
    Signed-off-by: Martin Renvoize <>

commit 36ee00ed952ed9081eeeca5e98fe006fbaa12db6
Author: Nick Clemens <>
Date:   Fri Jun 28 12:37:25 2019 +0000

    Bug 14549: Check patrons reserves for any holds on a bib when checking out 
an item
    MoveReserve uses CheckReserves to see if the current patron has any holds
    on the title they are checking out, however, CheckReserves doesn't return
    all holds on a biblio, it returns holds on the item from the holdsqueue
    if they exist
    This can create a condition where we check holds on an item, find we have 
it planned for
    another borrower, confirm checkout to the current borrower, but don't fill 
their hold
    To test:
      1) Find record
      2) place record level holds for 2 different patrons (record level)
      3) Run holds queue builder, check the queue to confirm an item was 
selected for patron 1
         Circulation->Holds queue->Library="All"
      4) Check out the item queued for patron with priority 1 to the second 
      5) You should be asked to confirm, do so
      6) Note the item checks out, but both holds remain
      7) Apply patch
      8) Check in the item
      9) Don't confirm the hold
     10) Check the holds on the record and the holds queue
     11) Patron 1 should be priority 1 with an item selected from the holds 
     12) Checkout to patron 2 as before
     13) Note the hold for patron 2 is filled this time
     14) Prove -v t/db_dependent/Reserves.t
    Signed-off-by: Chris Cormack <>
    Signed-off-by: Tomas Cohen Arazi <>
    Signed-off-by: Martin Renvoize <>

commit 33bd28fb856d496370f7132171aa479c77b28af8
Author: Nick Clemens <>
Date:   Fri Jun 28 12:36:16 2019 +0000

    Bug 14549: Unit tests
    To test:
    1 - Apply just this patch
    2 - prove -v t/db_dependent/Reserves.t
    3 - Failure
    4 - Apply second patch
    5 - prove -v t/db_dependent/Reserves.t
    6 - Success!
    Signed-off-by: Chris Cormack <>
    Signed-off-by: Tomas Cohen Arazi <>
    Signed-off-by: Martin Renvoize <>

commit 3eadb87fd86b2331d4ea58aa86f1810bbf952c89
Author: Martin Renvoize <>
Date:   Mon Aug 5 11:36:40 2019 +0100

    Bug 23396: DBRev
    Signed-off-by: Martin Renvoize <>

commit 5e4e26dd0f7516bd3dca4758bbc3c72e4b9723d5
Author: Tomas Cohen Arazi <>
Date:   Fri Aug 2 15:53:01 2019 -0300

    Bug 23396: (QA follow-up) Add atomic update
    New installs before the fix won't have the table populated, this patch
    adds a fix for that, including the shortcut added by bug 17178.
    Signed-off-by: Tomas Cohen Arazi <>
    Signed-off-by: Martin Renvoize <>

commit 484b8245af189edcaba64f191981cd5374237125
Author: Nick Clemens <>
Date:   Tue Jul 30 13:37:28 2019 +0000

    Bug 23396: Add keyboard_shortcuts.sql to C4/
    To test:
    1 - Back up your DB if you want to save it
    2 - sudo koha-mysql kohadev
        DROP database koha_kohadev;
        CREATE database koha_kohadev;
    3 - http://localhost:8081
    4 - Go through the web installer
    5 - Enable AdvancedCatalogingEditor
    6 - Try to load it, fails with JS console error: insert_copyright is not 
    7 - Apply patch
    8 - Repeat
    9 - This time editor loads
    Signed-off-by: Katrin Fischer <>
    Signed-off-by: Tomas Cohen Arazi <>
    Signed-off-by: Martin Renvoize <>

commit 0f5d14f70792d5406857a81c415bc3f58cbd8b96
Author: Bernardo Gonzalez Kriegel <>
Date:   Sun May 5 15:12:15 2019 -0300

    Bug 10492: Translation problems with TT directives in po files
    This patch implements the replacement of TTvariables
    '[%...%]' with normal placeholders '%s' for text
    inside HTML tags (eg. img, meta, input)
    The replacement is done in two files:
    *, used on create/update, so TTvars are not
    found on the text to translate (msgid)
    *, used on install time, so the correct
    translation is found (msgstr) and the right TTvar is put on
    the translated text.
    To test:
    Before applying the patch
    1) Update your favorite language
       cd misc/traslator
       perl translate update xx-YY
    2) Build a list (ini.txt) of 'msgid' to do a comparison
       msgcat --no-wrap --use-first po/xx-YY-*po -o - | egrep "^msgid" | sort > 
    3) Apply the patch
    4) Update your favorite language, again
       cd misc/traslator
       perl translate update xx-YY
    5) Build a final list (end.txt) of 'msgid' to do a comparison
       msgcat --no-wrap --use-first po/xx-YY-*po -o - | egrep "^msgid" | sort > 
    6) Compare both files, you must find (most) TTvars replaced by '%s'
       diff ini.txt end.txt
       for example:
       < msgid "Translate item type [% itemtype.itemtype | html %]"
       > msgid "Translate item type %s"
       < msgid "Holds on this item: [% item_loo.item_holds | html %] / Total 
holds on this record: [% item_loo.holds | html -%]"
       > msgid "Holds on this item: %s / Total holds on this record: %s"
       < msgid "tag_anchor_[% innerloo.tag | html %]_[% innerloo.index | html 
%][% innerloo.random | html %]"
       > msgid "tag_anchor_%s_%s%s"
       < msgid "[% innerloo.tag_lib | html %] - Click to Expand this Tag"
       > msgid "%s - Click to Expand this Tag"
    7) Translate one of the examples, with more than one variable if
    possible, for example this text in xx-YY-staff-prog.po
       > msgid "Holds on this item: %s / Total holds on this record: %s"
    Check it's not marked as 'fuzzy'
    8) Apply the translation
       perl translate install xx-YY
    9) Check the translated string has all variables in the right order
       edit koha-tmpl/intranet-tmpl/prog/es-ES/modules/tools/
       around line '187', first '[% item_loo.item_holds | html %]', then
       '[% item_loo.holds | html -%]' on this case,
       or use another example
    If approved this patch can be backported to current stable
    Signed-off-by: Owen Leonard <>
    Signed-off-by: Nick Clemens <>
    Signed-off-by: Martin Renvoize <>

commit 88ff22bb5a5d535893cf238ae784bb62a5b7d676
Author: Owen Leonard <>
Date:   Wed Jul 31 12:38:16 2019 +0000

    Bug 21518: Material type "three-dimensional artifact" displays as "visual 
    This patch makes a few corrections to the staff client MARC21 XSLT so
    that the correct material type icons are displayed for pictures and
    realia. The more-specific material type handling has been adapted from
    the corresponding XSL files in the OPAC.
    To test you must have default XSLT enabled and the DisplayIconsXSLT and
    DisplayOPACiconsXSLT system preferences enabled.
     - Apply the patch and locate records with "type of record" specified in
       the leader as 'g', 'k', and 'r'.
       A sample MARC file will be attached to the bug report with one of
       each type of record. Import the records and search your catalog for
     - View the records in search results and their detail pages, both in
       the OPAC and the staff client. In all cases the correct material type
       icon should be displayed.
    Signed-off-by: Lucas Gass <>
    Signed-off-by: Nick Clemens <>
    Signed-off-by: Martin Renvoize <>


Summary of changes:
 C4/                                    |    1 +
 C4/                                     |   34 +++++++++++---------                                            |    2 +-
 installer/data/mysql/             |   23 +++++++++++++
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |   13 +++++---
 .../prog/en/xslt/MARC21slim2intranetResults.xsl    |    4 ++-
 .../prog/img}/famfamfam/OB.png                     |  Bin 825 -> 825 bytes
 .../prog/img/famfamfam/{GR.png => PK.png}          |  Bin 606 -> 606 bytes
 .../prog/img/famfamfam/silk/object.png}            |  Bin 825 -> 825 bytes
 .../prog/img}/famfamfam/silk/picture.png           |  Bin 606 -> 606 bytes
 .../GR.png => opac-tmpl/lib/famfamfam/PK.png}      |  Bin 606 -> 606 bytes
 misc/translator/                   |   28 ++++++++++++----
 misc/translator/                        |    5 +++
 t/db_dependent/Reserves.t                          |   30 ++++++++++++++++-
 14 files changed, 111 insertions(+), 29 deletions(-)
 copy koha-tmpl/{opac-tmpl/lib => intranet-tmpl/prog/img}/famfamfam/OB.png 
 copy koha-tmpl/intranet-tmpl/prog/img/famfamfam/{GR.png => PK.png} (100%)
 copy koha-tmpl/{opac-tmpl/bootstrap/lib/famfamfam/silk/bricks.png => 
intranet-tmpl/prog/img/famfamfam/silk/object.png} (100%)
 copy koha-tmpl/{opac-tmpl/bootstrap/lib => 
intranet-tmpl/prog/img}/famfamfam/silk/picture.png (100%)
 copy koha-tmpl/{intranet-tmpl/prog/img/famfamfam/GR.png => 
opac-tmpl/lib/famfamfam/PK.png} (100%)

main Koha release repository
koha-commits mailing list

Reply via email to