[koha-commits] main Koha release repository branch master updated. v20.05.00-1913-g9d8523ed2b

Fri Nov 20 16:16:20 CET 2020

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  9d8523ed2b88c8fbf18fc61835967ff555a5dc55 (commit)
       via  a9e3db201e1863b30ac0e2654d82a15f0f8e44c0 (commit)
       via  279ce72e4ced3ca191a8ee4e109c28df169dfc20 (commit)
       via  6267eb7cba91ad8177cc60c4c7cba0b26b473cee (commit)
       via  181125242c33d439fb6bdbddccb6a86a03fa8c15 (commit)
       via  36a6ce301f961b0cefdca70ed9a903a1216e071f (commit)
       via  a508d3fcbec2c1d64b94fe66b288b28cc6998e37 (commit)
       via  cc970464ec7c881aaa9d8a33931a29a5951e6103 (commit)
      from  926ad3c1a69074b2905d9ef03e639db6ba8d6865 (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 9d8523ed2b88c8fbf18fc61835967ff555a5dc55
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Fri Nov 20 11:04:04 2020 -0300

    Bug 26922: Regression tests

    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit a9e3db201e1863b30ac0e2654d82a15f0f8e44c0
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Thu Nov 19 13:09:47 2020 -0300

    Bug 26922: Better error handling in SendAlerts

    This patch makes SendAlerts display a better error message when sending
    fails.

    To test:
    1. Set KohaAdminEmailAddress to admin at example.org
    2. Edit a vendor, set a valid email address
    3. Create a new basket, a new order. Send the basket
    => FAIL: As you did not configure a valid SMTP server, the email is not sent and logs displayed "unable to establish SMTP connection to (localhost) port 25", with the stracktrace.
    4. Apply this patch and reload all
    5. Repeat 3
    => SUCCESS: A simpler message is displayed, the stacktrace remains in
    the logs
    6. Sign off :-D

    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Signed-off-by: Victor Grousset/tuxayo <victor at tuxayo.net>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 279ce72e4ced3ca191a8ee4e109c28df169dfc20
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Nov 19 15:16:36 2020 +0100

    Bug 26557: (bug 23463 follow-up) Fix Batch import when incoming records contain itemnumber

    Prior to ug 23463 AddItemFromMarc where calling AddItem, that did not
    take into account the itemnumber field.
    Now that we are using Koha::Item, we need to remove the items.itemnumber
    field from the MARC record

    Test plan:
    1 - find an existing bib in your system with just one item
    2 - export that bib with the item attached
    3 - delete the barcode from your item in Koha
    4 - stage your exported marc file for reimport, match on biblionumber, set it to Always Add Items
    5 - confirm that the bib matches and the incoming 952 is parsed
    6 - click "Import this batch into the catalog"

    => Without this patch you get (in the logs, or hidden)
    manage-marc-import.pl: DBD::mysql::st execute failed: Duplicate entry '23' for key 'PRIMARY' [for Statement "INSERT INTO `items` ( `barcode`, `biblioitemnumber`, `biblionumber`, `ccode`, `cn_sort`, `cn_source`, `damaged_on`, `dateaccessioned`, `datelastborrowed`, `datelastseen`, `holdingbranch`, `homebranch`, `itemcallnumber`, `itemlost_on`, `itemnumber`, `itype`, `location`, `more_subfields_xml`, `onloan`, `permanent_location`, `replacementpricedate`, `timestamp`, `withdrawn_on`) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, current_timestamp, ? )" with ParamValues: 0="BC_23", 1=8, 2=8, 3="REF", 4='CN__23', 5=undef, 6=undef, 7="2014-09-04", 8=undef, 9="2014-09-04", 10="FPL", 11="FPL", 12="CN_23", 13=undef, 14="23", 15="BK", 16="GEN", 17=undef, 18=undef, 19="GEN", 20="2014-09-04", 21=undef] at /usr/share/perl5/DBIx/Class/Storage/DBI.pm line 1836.
    manage-marc-import.pl: DBIx::Class::Storage::DBI::_dbh_execute(): Duplicate entry '23' for key 'PRIMARY' at /kohadevbox/koha/Koha/Object.pm line 169
    manage-marc-import.pl: {UNKNOWN}: Transaction aborted: Duplicate ID. Rollback failed: DBIx::Class::Storage::txn_rollback(): Refusing to roll back without a started transaction at /kohadevbox/koha/tools/manage-marc-import.pl line 253 at /kohadevbox/koha/tools/manage-marc-import.pl line 253

    => With this patch applied, the new item must be added to the existing bibliographic record

    Signed-off-by: David Nind <david at davidnind.com>
    Signed-off-by: Victor Grousset/tuxayo <victor at tuxayo.net>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 6267eb7cba91ad8177cc60c4c7cba0b26b473cee
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Wed Sep 30 14:54:57 2020 +0200

    Bug 25548: (follow-up) Remove those rewrite redirects in koha-httpd.conf

    In etc/koha-httpd.conf for dev install, those rewrite redirects are already commented.
    Just remove them.

    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 181125242c33d439fb6bdbddccb6a86a03fa8c15
Author: David Cook <dcook at prosentient.com.au>
Date:   Wed May 20 15:08:05 2020 +1000

    Bug 25548: Remove Apache rewrite directives that trigger redirects

    Historically, we have used Apache rewrite directives to strip
    query parameters with no arguments from the query
    string (e.g. PARAM=&), and then redirect to the new URL.

    However, this slows down user activity, and depending on your
    HTTPS and proxy setup can cause suboptimal HTTP downgrades and
    upgrades.

    Test Plan:
    0) Apply patch
    1) Build Debian package
    2) Install Debian package and reload Apache
    3) Open developer tools on your favourite browser
    4) Go to Network tab in developer tools
    5) Go to /cgi-bin/koha/opac-main.pl
    6) Search for "test"
    7) Note a 200 status for "opac-search.pl?idx=&q=test"

    If you got a 302 status for "opac-search.pl?idx=&q=test"
    followed by a 200 status for "opac-search.pl?q=test", you
    will know that your Apache configuration wasn't updated.

    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 36a6ce301f961b0cefdca70ed9a903a1216e071f
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Wed Nov 18 13:15:04 2020 +0000

    Bug 7607: (follow-up) Address OPAC and limits

    This patch adds the same function to the OPAC and adds support for limits

    I adjust the class on staff side to match the one already existing on OPAC

    On the OPAC when you click the back button the fields are not enabled - on the staff side they are,
    I leave this problem for someone else to solve

    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit a508d3fcbec2c1d64b94fe66b288b28cc6998e37
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Thu Nov 5 19:00:32 2020 +0000

    Bug 7607: (follow-up) Disable rather than remove inputs

    Signed-off-by: Victor Grousset/tuxayo <victor at tuxayo.net>
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit cc970464ec7c881aaa9d8a33931a29a5951e6103
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Tue Nov 3 11:19:23 2020 +0000

    Bug 7607: Remove empty inputs when submitting search form

    This patch surrounds the operator, index, and query fields on the advanced search
    page wtih a 'search_set' class.

    This allows us to process them as a group and confirm the query is populated before submitting
    the other parts to the form

    TO test:
    1 - Go to advanced search
    2 - Use search boxes to search like:
        Title: (leave blank)
        Author: clinton
        keyword: shuffle
    3 - Perform search
    4 - Note no results as you searched for title:clinton etc.
    5 - apply patch
    6 - refresh and repeat
    7 - search is now correct
    8 - Try vaeious searches with 'more options' and selecting different operators

    Signed-off-by: David Nind <david at davidnind.com>
    Signed-off-by: David Cook <dcook at prosentient.com.au>
    Signed-off-by: Victor Grousset/tuxayo <victor at tuxayo.net>
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

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

Summary of changes:
 C4/ImportBatch.pm                                  |  4 ++
 C4/Letters.pm                                      | 33 ++++++++--
 debian/templates/apache-shared-intranet.conf       |  2 -
 debian/templates/apache-shared-opac.conf           |  2 -
 etc/koha-httpd.conf                                |  6 --
 .../prog/en/modules/catalogue/advsearch.tt         |  6 +-
 koha-tmpl/intranet-tmpl/prog/js/staff-global.js    | 17 +++++
 .../bootstrap/en/modules/opac-advsearch.tt         | 12 ++++
 t/db_dependent/Letters.t                           | 73 ++++++++++++++++++----
 9 files changed, 127 insertions(+), 28 deletions(-)

hooks/post-receive
-- 
main Koha release repository