[koha-commits] main Koha release repository branch 19.05.x updated. v19.05.04-72-g9ce2aa4

Fri Nov 15 10:21:29 CET 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  9ce2aa48d869303236ca3a4b9922a9f9d428c483 (commit)
       via  84e3cfcf94cdb394e17c557ad597f2ed39fccbd6 (commit)
       via  bcd1270a4a6b387c2dc960ea7b0d32a233e39f84 (commit)
       via  b4520c0a383d3e3ba9cf038a50e30306c57ba16e (commit)
       via  c6ebf0e5cf3acd2d4d06a798ad8af7c173dab382 (commit)
       via  fa96485296b2d3bf9a5f2bea73b811a023bc5e6f (commit)
      from  7e2e827c9e45806266148e32914aa5970210d949 (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 9ce2aa48d869303236ca3a4b9922a9f9d428c483
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Nov 13 12:35:45 2019 +0100

    Bug 24026: (bug 22847 follow-up) Display correctly max[onsite]issueqty (not the propagated ones)

    See bug 22847. We should never call ->Get in this template, we want
    to display the values in the DB, not the calculated ones

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

commit 84e3cfcf94cdb394e17c557ad597f2ed39fccbd6
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Nov 13 12:35:39 2019 +0100

    Bug 24026: (bug 22847 follow-up) Remove c/p issues

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

commit bcd1270a4a6b387c2dc960ea7b0d32a233e39f84
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Wed Oct 2 07:41:45 2019 +0000

    Bug 23713: (follow-up) Add missing semicolon

    Adds a missing semicolon to one of the lines with translated
    messages.

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

commit b4520c0a383d3e3ba9cf038a50e30306c57ba16e
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Oct 1 15:55:19 2019 +0000

    Bug 23713: Subscription add form broken for translations

    This patch makes a change to the subscription entry template as a
    workaround to a translation bug which is causing JavaScript errors when
    using translated templates.

    To test, apply the patch and update and install the de-DE template:

    > cd misc/translator
    > perl translate update de-DE
    > perl translate install de-DE

     - Go to Administration -> System preferences and enable the "Deutsch
       (de-DE)" language under I18N/L10N preferences -> language.
     - Switch to the "Deutsch" translation.
     - Go to Zeitschriften (Serials) -> Neues Abonnement (New subscription)
       and open the browser console. There should be no errors.
     - Links which trigger JavaScript events should work correctly:
       "Lieferant suchen," "Nach Datensatz suchen," etc.

    Reported-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
    Thanks-to: Michael Hoffert and Alexander Arlt from koha-de for reporting
     it initially and figuring out the root of the issue
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.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 0dd2d6883d1e98bed92b25c321110b37da739e88)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit c6ebf0e5cf3acd2d4d06a798ad8af7c173dab382
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Oct 24 18:21:04 2019 +0200

    Bug 23398: Disable the XML import/export format for biblio framework

    It gives incomplete results and not sure it ever worked.
    To prevent data loss it is better to remove this option.

    Note that the code in C4/ImportExportFramework.pm is too complex to
    attach with this patch to deletion of the code related to the XML
    import/export. Safer to keep it for a separate bug report.

    Test plan:
    Import/export biblio frameworks and confirm that there is no more
    reference to the xml format.

    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    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 ed45a4f333fb9f6569d150410ef99d8ffe13f54c)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit fa96485296b2d3bf9a5f2bea73b811a023bc5e6f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Oct 22 12:42:09 2019 +0200

    Bug 23813: (bug 18925 follow-up) Remove invalid circ rules to avoid FK constraints to fail

    There is not FK constraints on the itemtype, categorycode and branchcode
    columns of the issuingrules table, because of the '*' value we use for
    default.
    We created the new table circulation_rules with those constraints, and
    when we moved the rules for maxissueqty, the INSERT failed.

    To avoid the FK constraints to fail we are going to delete the invalid
    rows before.

    It could lead to data lost, but this situation certainly comes from a
    bad data manipulation at some point of the history of the installation.

    Test plan:
    git reset --hard 1e4f442442844cfaf17f5b06f122f6259d5fee92 # before 18.12.00.020
    reset_all

    insert into branches(branchcode, branchname) values('rmme', 'rmme');
    insert into categories (categorycode, description) values ('rmme', 'rmme');
    insert into itemtypes (itemtype, description) values('rmme', 'rmme');

    Go to http://pro.kohadev.org/cgi-bin/koha/admin/smart-rules.pl
    Create a new rule for the patron category
    Create a new rule for the item type
    Copy all the default rule to the new library
    Create other rules for "Default checkout, hold policy by patron category" and "Default holds policy by item type" using this patron's category and itemtype.
    Same for patrons' categories and itemtypes you will not delete.

    delete from branches where branchcode="rmme";
    delete from categories where categorycode="rmme";
    delete from itemtypes where itemtype="rmme";

    git checkout master
    and execute the DB process.

    => With this patch applied you will not get the error and the rules will
    be moved correctly.

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

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

Summary of changes:
 Koha/Template/Plugin/CirculationRules.pm               |    8 ++++----
 admin/import_export_framework.pl                       |    6 +-----
 installer/data/mysql/updatedatabase.pl                 |   11 +++++++++++
 .../prog/en/modules/admin/biblio_framework.tt          |   16 +++++++---------
 .../intranet-tmpl/prog/en/modules/admin/smart-rules.tt |    4 ++--
 .../prog/en/modules/serials/subscription-add.tt        |    8 ++++++--
 6 files changed, 31 insertions(+), 22 deletions(-)

hooks/post-receive
-- 
main Koha release repository