[koha-commits] main Koha release repository branch master updated. v18.05.00-82-g8480491

Fri Jun 22 15:50:34 CEST 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, master has been updated
       via  8480491cce306272ff443408f5b92eac470a3d63 (commit)
       via  abc6422355c779440c61bcbc56f727b6848e3d02 (commit)
       via  9b39b9d20b828adf9504b9681b2bee4ca751cc5d (commit)
       via  2e1ff5e96108af91174d080b49e31d78a8f959fa (commit)
       via  ac813cf4a124e5c0d3fae587f49b380ea6144e1c (commit)
       via  9e7062a0a6d1bd938675b18c13fc7a521615f44f (commit)
       via  20c927c5d0fd84d34e00bc5042113825ae53869e (commit)
       via  320978997be204a0650475dca4db75e0dd36c273 (commit)
       via  91622bba18d33af7699a634a697f432bd63dc25e (commit)
       via  b81746e40490f8d631d722e475d5b957ed27e028 (commit)
       via  b22e58525dc8b3dbe9cd0889a1a1c203b2c602cd (commit)
       via  70ea4d6b0f29dd0f822fef3b45a3cf82adb3b86f (commit)
       via  ea39ac2b180c576d80eea44d2d2f2ab0bdb2ddde (commit)
       via  82be39a3891dd2be838ca7a374450aa5fbe6b84b (commit)
       via  64c596b13c82a2942792d975363a0d689182d627 (commit)
       via  97b2bb8e7385c6af4d07666ce51df68b3bda8875 (commit)
       via  117e3a18f5b7c24e6c9fb7eabb78ab1b5320cd14 (commit)
      from  c967e010c0110e562c4cc71bc5d18837a2a956a0 (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 8480491cce306272ff443408f5b92eac470a3d63
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu May 3 13:12:19 2018 +0200

    Bug 20702: Bind results of GetHostItemsInfo to the EasyAnalyticalRecords pref

    Triggered by the finding on bug 20697.
    The three calls of GetHostItemsInfo should be controlled by the pref. This
    patch makes the sub return an empty list when the pref is disabled.

    The patch simplifies the sub by merging the two identical foreach loops
    depending on the field number in MARC21/UNIMARC.

    Will add a unit test on a follow-up patch.

    Test plan:
    See next patch.

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

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

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit abc6422355c779440c61bcbc56f727b6848e3d02
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu May 3 14:08:01 2018 +0200

    Bug 20702: Add unit tests for GetHostItemsInfo

    Unfortunately, we did not have unit tests yet.
    Adding some simple tests that test basic operation of the sub when the
    pref is enabled/disabled and for MARC21/UNIMARC.

    Test plan:
    [1] Run t/db_dependent/Items/GetHostItemsInfo.t

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

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

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 9b39b9d20b828adf9504b9681b2bee4ca751cc5d
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Wed Feb 21 11:07:56 2018 +0100

    Bug 20259: Shorter JS and CSS rewrite rule

    Bug 20187 has changed the JS and CSS rewrite rules to :
    RewriteRule ^(.*)_[0-9][0-9]\.[0-9][0-9][0-9][0-9][0-9][0-9][0-9].js$ $1.js [L]
    RewriteRule ^(.*)_[0-9][0-9]\.[0-9][0-9][0-9][0-9][0-9][0-9][0-9].css$ $1.css [L]

    This patch changes this rules using [0-9]{N} and fusion in one rule.
    And espaces the dot in extension js and css.

    Test plan :
    1) Go to intranet and opac
    2) Check CSS and JS are doing well
    3) Apply patch changes on our Apache configuration
    4) Reload intranet and opac pages (Ctrl + F5)
    5) Check CSS and JS are doing well

    Signed-off-by: Charles Farmer <charles.farmer at inLibro.com>

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

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 2e1ff5e96108af91174d080b49e31d78a8f959fa
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Sun May 20 04:23:47 2018 +0200

    Bug 20794: Hide holds tab on details when user lacks circulate_remaining_permissions

    If a user doesn't have circulate_remaining permissions, but has borrowers:
    - checkouts tab is hidden
    - details tab is visible
    - holds tab on details is visible, but results in an error

    The problem is that the svc/holds script requires circulate_remaining_permissions.

    To test:
    - Create 2 staff users with and without circulate_remaining_permissions
      Both need borrowers permission
    - Go to the details tab in a patron's account who has holds
    - Verify that you get a datatables error for the staff patron without
      circulate_remaining_permissions
    - Apply patch
    - Verify that now the holds tab is no longer displayed for this patron

    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>

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

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit ac813cf4a124e5c0d3fae587f49b380ea6144e1c
Author: Pasi Kallinen <pasi.kallinen at joensuu.fi>
Date:   Tue Jun 5 13:26:43 2018 +0300

    Bug 20881: Order receiving: Price filter missing on_editing

    When the Price-filter is used on editable data, it should have the
    on_editing -tag. Add it to the orderreceive.tt

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

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    To test:
    - Set CurrencyFormat to FR
    - Create a basket with orders in acq
    - Close it
    - Receive shipment and pick order line to receive
    - On this screen verify that the actual cost appears as comma-separated
    - Apply patch
    - Refresh page
    - Verify that the actual cost now appears .-separated

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

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 9e7062a0a6d1bd938675b18c13fc7a521615f44f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Jun 21 17:34:17 2018 -0300

    Bug 20981: Fix organization name when displaying patron's info

    Caused by bug 18403.
    From patron-title.inc, we need a IF instead of UNLESS.

    Test plan:
    Create organizations
    Search for patrons
    => Without this patch the "Name" column is empty for organizations
    => With this patch applied you will see the surname (and othernames if
    exists)

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 20c927c5d0fd84d34e00bc5042113825ae53869e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Jun 21 12:28:18 2018 -0300

    Bug 13655: Same fix for partial edit

    Test plan:
    - Create an organisation with surname='xxx'
    userid will be autogenerated with 'xxx''
    - Edit the surname with 'yyy'
    userid will be unchanged, 'xxx'
    - Parial edit and blank userid
    userid will be autogenerated with 'yyy'

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

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

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 320978997be204a0650475dca4db75e0dd36c273
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Apr 12 13:40:59 2018 -0300

    Bug 13655: Allow creation of organisations without entering userid

    See comment 1 of the bug report for defails of the issue.

    Test plan:
    Good luck (you will need to test all combinations (category type eq and
    ne 'I'), then quick edition and partial edit)

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

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

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 91622bba18d33af7699a634a697f432bd63dc25e
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Fri Jun 15 12:56:36 2018 +0200

    Bug 20951: add missing use Koha::Patron::Debarments in Koha::Patron::Discharge

    Koha::Patron::Discharge was missing use Koha::Patron::Debarments used in discharge() method.

    Test plan :
    1) Enable pref useDischarge
    2) Go to OPAC user page
    3) Go to 'ask for a discharge' tab
    4) Click on 'Ask for a discharge'
    5) Go to staff interface : /cgi-bin/koha/members/discharges.pl
    6) Click on Allow
    => Without patch you get software error
    => With patch the discharge is validated

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

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

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit b81746e40490f8d631d722e475d5b957ed27e028
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Jun 14 11:43:12 2018 -0300

    Bug 20928: Fix regression - display patron's info on moredetail if item is checked out

    This patch is a follow-up of
      commit 5f80977875ff124d411f2cd89de4a944fa9c27af
      Bug 18403: Use patron-title.inc when hidepatronname is used

    Test plan:
    - Check an item out
    - Go on the moredetail.pl page of this biblio record
    Home › Catalog › Item details for your biblio
    - Confirm that you see:
    "Checkout status: Checked out to"
    followed by the patron's info

    Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
    Followed the test plan and it works.

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

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit b22e58525dc8b3dbe9cd0889a1a1c203b2c602cd
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Jun 8 13:06:58 2018 -0300

    Bug 20906: Fix translatable-templates.t

    From Jenkins:
    koha_1       | #   Failed test 'staff_prog templates are translatable'
    koha_1       | #   at xt/author/translatable-templates.t line 87.
    koha_1       | # Can't locate TmplTokenizer.pm in @INC (you may need to install the TmplTokenizer module) (@INC contains: /kohadevbox/koha /etc/perl /usr/local/lib/x86_64-linux-gnu/perl/5.24.1 /usr/local/share/perl/5.24.1 /usr/lib/x86_64-linux-gnu/perl5/5.24 /usr/share/perl5 /usr/lib/x86_64-linux-gnu/perl/5.24 /usr/share/perl/5.24 /usr/local/lib/site_perl /usr/lib/x86_64-linux-gnu/perl-base) at ./tmpl_process3.pl line 20.

    On Stretch, '.' is not longer added to @INC, see bug 17717 for more info

    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 70ea4d6b0f29dd0f822fef3b45a3cf82adb3b86f
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date:   Fri Jun 8 15:21:22 2018 +0100

    Bug 20906: Prevent test failures due to precision changes (2)

    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit ea39ac2b180c576d80eea44d2d2f2ab0bdb2ddde
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date:   Fri Jun 8 14:32:02 2018 +0100

    Bug 20906: Prevent test failures due to stricter perl

    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 82be39a3891dd2be838ca7a374450aa5fbe6b84b
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date:   Fri Jun 8 12:50:31 2018 +0100

    Bug 20906: Prevent test failures due to precision changes

    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 64c596b13c82a2942792d975363a0d689182d627
Author: Josef Moravec <josef.moravec at gmail.com>
Date:   Mon Jun 18 15:48:12 2018 +0000

    Bug 20934: (QA follow-up) Fix showing number of records in checkout history

    Test plan:
    0) Do not apply this patch
    1) Go to biblio checkout history page (issuehistory.pl)
    2) You'll see something like "Checked out ARRAY(0xf830378) times"
    3) Apply this patch
    4) Now you should see number of checkout history records

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

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 97b2bb8e7385c6af4d07666ce51df68b3bda8875
Author: Josef Moravec <josef.moravec at gmail.com>
Date:   Mon Jun 18 15:15:31 2018 +0000

    Bug 20934: (QA follow-up) Fix pod in Koha::Old::Checkout

    Test plan:
    Run qa tools - it shouldn't complain about pod levels

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

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 117e3a18f5b7c24e6c9fb7eabb78ab1b5320cd14
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Jun 13 13:26:43 2018 -0300

    Bug 20934: Fix display of old checkouts in the checkout history page

    Again a regression caused by
      commit fa54100dffe092e606f79b15692eedaf78f42e45
      Bug 18403: Use patron-title.inc when hidepatronname is used [SPECIFIC for issuehistory]

    GetBiblioIssues does a union all with issues and old_issues, so we
    should old_issues as well.
    To make the join on the items table we need to define the item and
    patron methods. For consistency the relationships have been redefined
    (item instead of itemnumber, borrower instead of borrowernumber) in the
    DBIx::Class definition.

    This is not perfect but I think the best way to provide an easy to
    backport patch.

    It highlights that we need improvements in this area.

    Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
    The patch works as expected.

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

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

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

Summary of changes:
 C4/Items.pm                                        |   62 +++++++++-----------
 Koha/Old/Checkout.pm                               |   36 ++++++++++++
 Koha/Patron/Discharge.pm                           |    1 +
 Koha/Schema/Result/OldIssue.pm                     |   19 ++++++
 catalogue/issuehistory.pl                          |   13 +++-
 debian/templates/apache-shared-intranet.conf       |    3 +-
 debian/templates/apache-shared-opac.conf           |    3 +-
 docs/CAS/CASProxy/examples/proxy_cas_data.pl       |    2 +-
 etc/koha-httpd.conf                                |    6 +-
 .../prog/en/includes/patron-title.inc              |    8 +--
 .../prog/en/modules/acqui/orderreceive.tt          |    2 +-
 .../prog/en/modules/catalogue/issuehistory.tt      |    4 +-
 .../prog/en/modules/catalogue/moredetail.tt        |    6 +-
 .../prog/en/modules/members/moremember.tt          |    5 +-
 members/memberentry.pl                             |    4 +-
 t/db_dependent/Accounts.t                          |    4 +-
 t/db_dependent/Bookseller.t                        |   44 +++++++++-----
 t/db_dependent/Items/GetHostItemsInfo.t            |   41 +++++++++++++
 xt/author/translatable-templates.t                 |    8 ++-
 19 files changed, 192 insertions(+), 79 deletions(-)
 create mode 100644 t/db_dependent/Items/GetHostItemsInfo.t

hooks/post-receive
-- 
main Koha release repository