[koha-commits] main Koha release repository branch 19.05.x updated. v19.05.02-98-gbb6e73c

Tue Aug 6 17:16:02 CEST 2019

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, 19.05.x has been updated
       via  bb6e73c5babc0d5566a6be77a98e621082eb8bd4 (commit)
       via  a6718b95c1b123a5fb8616a84c110c37a55b3ffd (commit)
       via  f558185c8fbf5b5740959c0ec06b2188d6b16f4a (commit)
       via  1c3f3bde8940b5e7d130ec2625065a6b1d9afb4b (commit)
       via  aa5f0a55a399efde55d91f1a33423ef9005e94aa (commit)
       via  7468abdf951cfd70a70ff334ecbcde5187536518 (commit)
       via  267ad48da77eb3fedd06f1050db0ffc4406477c2 (commit)
       via  b1e0a867c9ee6dbd9887c40e26efceb60e50b610 (commit)
       via  40e367331b09e8e20a5150f35993caf25dcff353 (commit)
       via  44cd65d3ee688f24a077d51214bfa670a2cc5deb (commit)
       via  62c9eb6c8cb925a51a51c2c06a7edb5a3e1ef3f3 (commit)
       via  a721c50e4f1752c1f102172135b48fc5887c053a (commit)
      from  c315ec1a1914b207766449aff497dfd293377cbd (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 bb6e73c5babc0d5566a6be77a98e621082eb8bd4
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Jul 9 13:51:24 2019 +0000

    Bug 23078: (follow-up) Update self checkout help page

    This patch takes care of some preference instances I missed in the self
    checkout module's help page. It also removes some obsolete lines from
    Auth.pm.

    To test, apply the patch and re-test based on the previous test plan.
    Also test in the self-checkout module by logging into self checkout and
    clicking the "Help" link in the upper right of the screen.

    The settings of the following preferences should be shown correctly:

     - OpacFavicon
     - OPACUserCSS

    Signed-off-by: frederik chenier <frederik.chenier at inlibro.com>
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit b5588958981a24c25536afff0b2091506bf7f92b)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit a6718b95c1b123a5fb8616a84c110c37a55b3ffd
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Jun 7 12:52:45 2019 +0000

    Bug 23078: Use Koha.Preference in OPAC global header include

    This patch updates the OPAC's doc-head-close.inc so that it uses
    'Koha.Preference' syntax to output system preference data. The patch
    removes handling of two preferences from Auth.pm which which are covered
    by this template change.

    This patch also makes some minor changes to consolidate multiple
    template checks for "bidi"

    To test, apply the patch and test the affected OPAC system preferences:

     - OpacFavicon
     - opaclayoutstylesheet
     - OPACUserCSS
     - OPACBaseURL

    Confirm that changes made to these preferences are reflected in the
    OPAC.

    Signed-off-by: frederik <frederik at inlibro.com>
    Signed-off-by: Nadine Pierre <nadine.pierre at inLibro.com>
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 6a222fa2afd367257b7e0c9815a92521883128d4)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit f558185c8fbf5b5740959c0ec06b2188d6b16f4a
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Jul 5 17:28:06 2019 +0000

    Bug 23278: Reopen last panel upon "Save and continue" in notices

    This patch modifies the Notices edit process so that if the user chooses
    the "Save and continue" option the page reloads with the same panel open
    which they were previously editing in.

    To test, apply the patch and go to Tools -> Notices and Slips.

     - Open a notice for editing.
     - Expand one of the sections.
     - Choose "Save and continue" from the button menu in the toolbar.
       - When the page reloads, the section you expanded should be open
         again.
     - Test each section and test with no sections expanded.

    Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 2c600bf439173c8a7a8ecd41a6433cd1199de078)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 1c3f3bde8940b5e7d130ec2625065a6b1d9afb4b
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Jul 12 13:41:30 2019 +0000

    Bug 23304: (follow-up) Add markup structure comments

    This patch adds comments to the template to highlight the markup
    structure. It also removes the obsolete "type" attribute from the
    <script> tag.

    This patch should have no effect on the interface or functionality.

    Signed-off-by: Nadine Pierre <nadine.pierre at inLibro.com>
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit b76aa551049edcb1575d8a4cce917cbc0eb8fa24)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit aa5f0a55a399efde55d91f1a33423ef9005e94aa
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Jul 11 18:59:21 2019 +0000

    Bug 23304: Reindent cataloguing/z3950_search.tt

    This patch reindents cataloguing/z3950_search.tt to use four spaces and
    to eliminate tabs, following coding guidelines. Trailing white space has
    been removed, and some minor markup errors have been corrected for
    validity.

    To test, apply the patch and use your preferred method for checking the
    differences between files while ignoring whitespace. I use diff with the
    "-w" flag, but I'm not giving orders, you do you.

    Go to Cataloging -> New from Z39.50/SRU. Test that the search form and
    results look correct and work correctly.

    Signed-off-by: Nadine Pierre <nadine.pierre at inLibro.com>
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 377006ebe5a0e87a6f7517f0cb347a958c95a997)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 7468abdf951cfd70a70ff334ecbcde5187536518
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Sat Jul 13 14:23:19 2019 +0200

    Bug 22021: Improve item status display when placing holds in staff

    This patch is a bit of a clean-up to bring the item status display
    more in line with the display on the detail page:

    - show descrpition of authorised value for not for loan instead of hardcoded text
    - Show description of authorised value for lost instead of hardcoded text
      This is also a translatability fix, as the text came from the .pl
    - Show description of authorised value damaged instead of hardcoded text
    - Make sequence of status match display on details page:
      lost - damaged - not for loan

    To test:
    - On a record with multiple items
      - Add different status to the items
        damaged, lost, not for loan
      - Make sure you have items with one status and multiple status at the same time
    - Look at how the status display on the detail page
    - Place a hold, compare display
    - Apply patch
    - Repeat

    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit d7e6ae38e431c4d6397c057b0696e03f5a67ce14)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 267ad48da77eb3fedd06f1050db0ffc4406477c2
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri Jul 19 10:49:00 2019 +0000

    Bug 23218: (QA follow-up) Remove dummy value

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit bc188a9a54e28bd4fa2568dab5e85cf296fa87ab)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit b1e0a867c9ee6dbd9887c40e26efceb60e50b610
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Sat Jun 29 10:18:29 2019 -0500

    Bug 23218: Fix shift in patron's attributes in batch patron modification

    When the "new" button is clicked without selecting a patron's attribute, the update will have unexpected behaviors.

    There is indeed a difference in the number of patron's attributes and the number of values.

    Test plan:
    Go to the batch patron modification
    Enter a cardnumber
    At the bottom of the page, click "new" without selecting an attribute
    On the second line select one, and a value (different than an empty
    string)
    Save
    => The attribute will be updated with an empty string

    Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit ea0127b7fa53335f3e9d3f0170fbc92b2ffd9e3c)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 40e367331b09e8e20a5150f35993caf25dcff353
Author: Pasi Kallinen <pasi.kallinen at koha-suomi.fi>
Date:   Thu Jun 27 14:03:02 2019 +0300

    Bug 23048: Hide non-pickup branches from hold modification select

    When modifying holds in staff client via reserve/request.pl or
    the holds-tab in members/moremember.pl, the pickup library dropdown
    lists libraries not marked for pickup. Hide those branches,
    unless the branch is marked as a pick-up branch for already
    existing hold.

    The reason for showing a non-pickup branch for the holds created
    before the branch was marked as non-pickup: If the non-pickup branch
    wasn't shown, the branch in those holds would get set to the first
    branch in the select if the hold was modified.

    Test plan:
    1) Create a hold for a patron, to be picked up from a certain branch.
    2) Edit the branch and another branch so they are no longer
       pickup locations.
    3) Go to members/moremember.pl for that patron, check the Holds-tab
       Pickup library -drop down. It lists both of the non-pickup branches.
    4) Go to reserve/request.pl for that biblio. The hold-table
       Pickup library -drop down lists both of the non-pickup branches.
    5) Apply patch.
    6) Repeat 3 & 4, drop down no longer lists the non-pickup branch, but
       should still list the branch where the hold was marked to be picked
       from.

    Signed-off-by: Pasi Kallinen <pasi.kallinen at koha-suomi.fi>
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 84855d75c1ddc770bf33b952b8f319ad1655a869)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 44cd65d3ee688f24a077d51214bfa670a2cc5deb
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Jul 16 18:05:23 2019 +0000

    Bug 23145: Confirming transfer during checkin clears the table of previously checked-in items

    This patch corrects the checkin template so that checking in an item
    with an existing transfer does not clear the page of previous checkouts.

    To test, apply the patch and check in some items.

     - After each checkin the returned item should appear in the table of
       checkouts.
     - Check in an item which belongs to another branch. You will be asked
       to confirm that the items requires a transfer. When the page reloads
       you should see the same previous checkins in the table.
     - Check in that same item again. You will be again asked to confirm.

       Before this page, confirming the transfer would reload the page and
       clear the list of checkins. Now the page should reload and the table
       of checkins should still show the previously checked-in items.

    Test all the actions when checking in an item which is already in
    transit: OK, Print transfer slip, and Cancel transfer.

    Signed-off-by: George Williams <george at nekls.org>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 3cfd78788fe1bda05894a08c22f69ce1baa9482c)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 62c9eb6c8cb925a51a51c2c06a7edb5a3e1ef3f3
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Tue Jul 16 18:13:57 2019 +0000

    Bug 20607: (QA follow-up) Test corrections

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 29ecb5b6c29e48cb6964029567bd2b7cc8b6e7ac)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit a721c50e4f1752c1f102172135b48fc5887c053a
Author: Alex Arnaud <alex.arnaud at gmail.com>
Date:   Tue Apr 24 13:10:38 2018 +0000

    Bug 20607: Make Koha::SearchEngine::Elasticsearch::reset_elasticsearch_mappings take weight into account

    Test plan:
      - apply this patch,
      - edit admin/searchengine/elasticsearch/mappings.yaml
        to add weight for some fields,
      - go to admin > search engine configuration,
      - reset your mappings (add ?op=reset&i_know_what_i_am_doing=1 to url),
      - check that weights you've added are set

    Signed-off-by: Nicolas Legrand <nicolas.legrand at bulac.fr>
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit d8830da219f110aabd28fb65bd03bc882b847173)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 C4/Auth.pm                                         |    4 -
 Koha/SearchEngine/Elasticsearch.pm                 |   21 +-
 .../intranet-tmpl/prog/en/includes/holds_table.inc |    2 +-
 .../prog/en/modules/cataloguing/z3950_search.tt    |  387 +++++++++++---------
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |   63 ++--
 .../prog/en/modules/reserve/request.tt             |   71 ++--
 .../intranet-tmpl/prog/en/modules/tools/letter.tt  |    1 +
 .../prog/en/modules/tools/modborrowers.tt          |    4 +-
 koha-tmpl/intranet-tmpl/prog/js/holds.js           |    5 +-
 koha-tmpl/intranet-tmpl/prog/js/letter.js          |   14 +-
 .../bootstrap/en/includes/doc-head-close.inc       |   31 +-
 .../opac-tmpl/bootstrap/en/modules/sco/help.tt     |    5 +-
 reserve/request.pl                                 |   12 -
 .../Koha/SearchEngine/Elasticsearch/Reset.t        |   68 ++++
 tools/letter.pl                                    |    7 +-
 15 files changed, 402 insertions(+), 293 deletions(-)
 create mode 100644 t/db_dependent/Koha/SearchEngine/Elasticsearch/Reset.t

hooks/post-receive
-- 
main Koha release repository