[koha-commits] main Koha release repository branch 17.11.x updated. v17.11.12-69-gaaa26d8

Wed Dec 19 13:26:40 CET 2018

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  aaa26d83a91fb4a77fbf8f6bc04c02509252ab0e (commit)
       via  727830e5ad183627d5877728d6c3c2315b36e8c5 (commit)
       via  d31d56375106596c22a49544a05fa1d4e0df99e1 (commit)
       via  14a71ef32de9c1cd0a846048359db35e1df15f00 (commit)
       via  ea47f283988cb70d41829bba311c9d1f2088d8be (commit)
       via  54e1078dec19ced9f77735cafa39863483ad41ca (commit)
       via  128b0736855aaa5c106dc8c0f30e92cf9d9f35f6 (commit)
       via  4e7e41f2a938b6d863f34ab85f51ba7f2f47f963 (commit)
       via  8e15f71daf60884a838bd08fd0f5fc61b1b5e2b8 (commit)
       via  e47d9fd8b656f7807470ba83cf69df8673a7c0b6 (commit)
      from  516f58008cf6859590bc925d01023813565b361e (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 aaa26d83a91fb4a77fbf8f6bc04c02509252ab0e
Author: Andreas Roussos <arouss1980 at gmail.com>
Date:   Thu Nov 22 15:55:25 2018 +0200

    Bug 21861: (follow-up) replace onchange() with jQuery equivalent

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit f44a4f1d2a13735c52948df29e773728d04ab991)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit cc0833fec6ac0e4f5008c855d8c0034c56870fa4)

    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
    (cherry picked from commit 1280bace7d797e49a3bc947f264733625247b25d)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 727830e5ad183627d5877728d6c3c2315b36e8c5
Author: Andreas Roussos <arouss1980 at gmail.com>
Date:   Sat Nov 17 20:03:36 2018 +0200

    Bug 21861: The MARC modification template actions editor does not always validate user input

    The MARC modification template actions editor does not validate
    user input when adding a conditional clause, making it possible
    to save a modification action without filling in all necessary
    fields.

    This patch fixes that.

    Test plan:
    1) Create a MARC modification template and add a new action,
       e.g. "Copy All field(s) 200$a to field 600$a".
       Add a condition ("if" or "unless") but leave the relevant
       field and subfield textboxes empty.
       Add "matches" or "doesn't match" as a comparison operator.
       Check the "RegEx" checkbox, leave the regex textbox empty.
    2) Click on "Add action" and notice how it accepts your input.
       Also notice the extra space in the Action column RegEx.
    3) Edit your modification action and notice the missing "m/"
       before the conditional RegEx.

    4) Apply the patch and hit CTRL-F5 to reload the relevant JS.

    5) Edit the modification action you added previously (or add
       a new one). Try leaving the textboxes mentioned above empty
       and then submit your changes. You should get pop-up windows
       informing you about missing fields.
    6) Now try typing a value in the conditional regex textbox and
       Update your action. In the Action column, there should be
       no spaces between the delimiters of the matching operator
       and the value you just entered.
    7) Edit your action: notice how the "m/" before the regular
       expression and the "/" after it are now showing correctly.

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 3e1e1448e9132dce81571a4c3f31eb67816f14f9)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit a616b9fc0266fdc9a5d299d5927f8b4a2236c559)

    Conflicts:
    	koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt

    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
    (cherry picked from commit 4baf83a09a2c1ae8c9def18c967eb256564ef719)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit d31d56375106596c22a49544a05fa1d4e0df99e1
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Tue Nov 20 16:45:17 2018 +0100

    Bug 21867: Replace remaining document.element.onchange calls in marc_modification_templates.js

    Replace onchange() by jQuery change().

    Test plan:
    Go to marc mod templates. Add, edit and delete. Check if works and no js
    errors.
    git grep -l -E "onchange\(" should not have occurrences outside lib.

    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Andreas Roussos <arouss1980 at gmail.com>

    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit be78d3177e8b9bbf90c7071dc6b6e3385674d106)

    Signed-off-by: Jesse Maseto <jesse at bywatersolution.com>
    (cherry picked from commit 99436fa499e6f08f4575a4135344a46aa0bb6a94)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 14a71ef32de9c1cd0a846048359db35e1df15f00
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Tue Nov 20 16:32:46 2018 +0100

    Bug 21819: (QA follow-up) Replace onchange() in touched code

    AFAIK we should not call document...onchange() and assume that it works.
    Apparently, it does at least in some browsers. But we are not sure.
    We could easily replace them here by the documented jQuery counterpart.

    Note: If you try git grep -l -E "onchange\(" you will find some
    occurrences in two libraries and only in one js file (this one).
    We should replace all occurrences here; will open a new report for that.

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Verified that the change event was triggered: span should expand/collapse.

    Signed-off-by: Andreas Roussos <arouss1980 at gmail.com>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit aeaf74b7cc6608d7b81aaba10defdca6decdaa1d)

    Signed-off-by: Jesse Maseto <jesse at bywatersolution.com>
    (cherry picked from commit 45b7f1703858a93d563934215326ff97e234abf6)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit ea47f283988cb70d41829bba311c9d1f2088d8be
Author: Andreas Roussos <arouss1980 at gmail.com>
Date:   Sat Nov 17 11:35:00 2018 +0200

    Bug 21819: Marc modification templates action always checks Regexp checkbox

    When editing a MARC modification template action, the 'RegEx'
    checkbox to the right of the 'to field' textboxes will always
    appear checked, even if no regular expression has been added.

    This patch fixes that.

    Test plan (steps 1-5 are copied from the original report -- thanks Pasi!):
    1) Go to Tools > Marc modification templates, and create a new template
    2) Add a new action to the template
    3) Edit the action so it's "Move" field to another field.
       Do not check the RegEx checkbox after the "To" field.
    4) Save the action.
    5) Edit the same action again. The checkbox is now checked.
    6) Apply the patch and hit Ctrl-F5 to do a hard refresh in your browser.
    7) Edit the action you saved in 4): this time the 'RegEx' checkbox
       should be unchecked.
    8) For completeness, add a regular expression to the "Move" action
       created in 3) and click on 'Update action'. When you re-edit this
       action the 'RegEx' checkbox should be checked.

    Signed-off-by: Pasi Kallinen <pasi.kallinen at joensuu.fi>

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit a9fc00db03a8210b3edb69a922209a4e8f6df9a1)

    Signed-off-by: Jesse Maseto <jesse at bywatersolution.com>
    (cherry picked from commit 57e031929df2b061c70341dee5efafb1ebd614f3)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 54e1078dec19ced9f77735cafa39863483ad41ca
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri Nov 16 17:23:14 2018 +0000

    Bug 21854: Use template plugin to display category description

    Rather than getting the description in the script and passing, we should
    just use the tmeplate plugin to get the description from the category
    code.

    To test:
    1 - Find a patron, note their category
    2 - Visit Tools - Batch patron modification
    3 - Enter barcode of patron above
    4 - Note category does not show in the display of patrons to be modified
    5 - Apply patch
    6 - Reload the page, note the patron category displays
    7 - Modify the patron (anything but category)
    8 - Check that category still diplays correctly in results

    Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.com>
    Signed-off-by: Andreas Roussos <arouss1980 at gmail.com>

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit df68391a5ec2eac05a88373dc10c136c8d057e98)

    Signed-off-by: Jesse Maseto <jesse at bywatersolution.com>
    (cherry picked from commit 391e7f7188472f3399007c836c0605cfc1277a30)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 128b0736855aaa5c106dc8c0f30e92cf9d9f35f6
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Wed Nov 14 19:08:09 2018 +0000

    Bug 21837: Don't set holdingbranch filter using selected homebranch filter

    To recreate:
    1 - Open the overdues report (don't worry if you don't have results)
    2 - Choose to filter by homebranch
    3 - Note the holdingbranch filter is set to the selected homebranch
    4 - Apply patch
    5 - Clear filters
    6 - repeat
    7 - only homebranch is set

    Signed-off-by: Owen Leonard <oleonard at myacpl.org>

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 81ac96abec1226b6635022c0a3f69697d13c7d62)

    Signed-off-by: Jesse Maseto <jesse at bywatersolution.com>
    (cherry picked from commit cf8a03db2cf3bdcfbad8566377f54fd84face864)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 4e7e41f2a938b6d863f34ab85f51ba7f2f47f963
Author: Nightly Build Bot <nightly at abunchofthings.net>
Date:   Tue Dec 11 16:05:33 2018 +0100

    Bug 20952 - Automatic debian/control updates (oldoldstable/17.11.x)

    Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 8e15f71daf60884a838bd08fd0f5fc61b1b5e2b8
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Sun Nov 18 05:36:44 2018 +0000

    Bug 21853: (follow-up) to solve printpdf error

    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Theoretically this follow-up makes no difference. All modules only export
    printpdf and now we are just asking explicitly for printpdf. But if it
    resolves some exception on the rule..

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 5b62714e47d5acd0a4c371024edacc02cfe6f5b5)

    Signed-off-by: Jesse Maseto <jesse at bywatersolution.com>
    (cherry picked from commit 21536e3314091778c9baf2984097715e071abfbc)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit e47d9fd8b656f7807470ba83cf69df8673a7c0b6
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Sat Nov 17 11:58:02 2018 +0100

    Bug 21853: Fix PDF export of basketgroups

    In recent versions of Perl, '.' is not included by default in @INC. This
    breaks PDF export of basketgroups.

    This patch moves acqui/pdfformat/*.pm files in Koha namespace so that
    they can be 'require'd without manipulating @INC

    Test plan:
    1. Turn off Plack/Starman and test PDF export for every value of
       OrderPdfFormat system preference
    2. Turn on Plack/Starman and test PDF export for every value of
       OrderPdfFormat system preference
    3. Test on a dev install and a standard/package install

    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 3c18d4c18fad5a0d470c7bdf1ac746a640f25099)

    Signed-off-by: Jesse Maseto <jesse at bywatersolution.com>
    (cherry picked from commit 320f9bf3d29b145eb2c6948ae517d0fe2e704f5f)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 {acqui => Koha}/pdfformat/layout2pages.pm          |    3 +-
 {acqui => Koha}/pdfformat/layout2pagesde.pm        |    3 +-
 {acqui => Koha}/pdfformat/layout3pages.pm          |    3 +-
 {acqui => Koha}/pdfformat/layout3pagesfr.pm        |    2 +-
 acqui/basketgroup.pl                               |   31 ++++++------
 circ/overdue.pl                                    |    2 +-
 debian/control                                     |    2 +
 .../modules/tools/marc_modification_templates.tt   |    8 ++--
 .../prog/en/modules/tools/modborrowers.tt          |   27 ++++++-----
 .../prog/js/marc_modification_templates.js         |   50 ++++++++++++++------
 tools/modborrowers.pl                              |    1 -
 11 files changed, 77 insertions(+), 55 deletions(-)
 rename {acqui => Koha}/pdfformat/layout2pages.pm (99%)
 rename {acqui => Koha}/pdfformat/layout2pagesde.pm (99%)
 rename {acqui => Koha}/pdfformat/layout3pages.pm (99%)
 rename {acqui => Koha}/pdfformat/layout3pagesfr.pm (99%)

hooks/post-receive
-- 
main Koha release repository