[koha-commits] main Koha release repository branch master updated. v20.05.00-1319-g9ddb312749

Fri Oct 9 13:37:45 CEST 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  9ddb312749c34fc4d1c19d48570725978c813bbd (commit)
       via  a9f2fc1eb90bc622daf902b83b7b3c55597710ef (commit)
       via  8b541714a177fc141c77967c8fc528c5c5453139 (commit)
       via  f8093f18d4c04fc75af43add253c973c7bb700f8 (commit)
       via  00d2b1aae634f7093c614274bc8fe0b7f2163595 (commit)
       via  da218a0d6ffad028792a3f1833679149478dd443 (commit)
       via  c361e1f4dd0049c036167e9a998a8ec6123fcf3d (commit)
       via  039adae9aa4fa3be76e16633cb64a45ca7d7ed46 (commit)
       via  ab6494fc3de5fc4f325941baf1c65f67634b1c1b (commit)
       via  fc022ab894d863dc660ca57b2d45543a3b4445ec (commit)
       via  12253d53821b6764e2084db85eb0b56a72a3694c (commit)
       via  b7d31ef16dd25e025a72397b8eaf2a218f21e2f7 (commit)
      from  e9c799e94239f1e533eb075bc0a347138b32ae75 (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 9ddb312749c34fc4d1c19d48570725978c813bbd
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date:   Fri Oct 9 11:28:12 2020 +0100

    Bug 23695: (QA follow-up) Revert 'Orginating library' option

    At my request, we added an 'Originating library' option to the manual
    transfers form.

    However, we did not properly pass this through in the controller and I
    have since discovered that my request was ill conceived/a
    misunderstanding of requirements.

    This patch removes the option from the template and drops the references
    to it in the controller.

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

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

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

commit a9f2fc1eb90bc622daf902b83b7b3c55597710ef
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri Oct 9 10:42:31 2020 +0000

    Bug 23852: (QA follow-up) Fix remaining call to biblio-default-view

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

commit 8b541714a177fc141c77967c8fc528c5c5453139
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Oct 8 11:33:23 2020 +0200

    Bug 26137: Remove warnings from viewlog.pl

    The warnings are
    Use of uninitialized value $val in concatenation (.) or string at /kohadevbox/koha/C4/Templates.pm line 138.
    Problem = a value of  has been passed to param without key at /kohadevbox/koha/C4/Templates.pm line 138.

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

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

commit f8093f18d4c04fc75af43add253c973c7bb700f8
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Oct 9 11:04:20 2020 +0000

    Bug 26529: DBRev 20.06.00.048

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

commit 00d2b1aae634f7093c614274bc8fe0b7f2163595
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Thu Oct 8 17:48:22 2020 +0000

    Bug 26529: (follow-up) Remove other instance of blanking holdallowed from script

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

commit da218a0d6ffad028792a3f1833679149478dd443
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Mon Sep 28 13:57:01 2020 +0000

    Bug 26529: Remove existing blank rules

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

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

commit c361e1f4dd0049c036167e9a998a8ec6123fcf3d
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Mon Sep 28 13:39:48 2020 +0000

    Bug 26529: Unit tests

    This tests tries to set some rules to blank, and then fetch the effective rule - nothing should be
    returned as these values are 'Not set'

    To test:
    1 - Apply just this patch
    2 - Tests fail
    3 - Apply second patch
    4 - Tests pass

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

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

commit 039adae9aa4fa3be76e16633cb64a45ca7d7ed46
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Thu Sep 24 18:21:45 2020 +0000

    Bug 26529: Define some rules as not able to be blank

    Currently, the 'Default checkout, hold, and return policy' have a conditional to blank
    'holdallowed' when not set, but other rules don't get the same treatment

    This patch uses the existing hash that controls the scope of rules and adds a
    new parameter 'can_be_blank' Default is assumed to be true, can_be_blank, but if set to '0' then
    blank rule values will not be save to the database

    To test:
     0 - Set CircControl to 'the library the item is from'
     1 - Goto to Admin -> Circulation and fines rules and select a library
     2 - Under "Default checkout, hold, and return policy" set:
        Total current checkouts allowed: 1
        Hold policy: Not set
        Hold pickup library match: Not set
        Return policy: Not set
     3 - Save the rule
     4 - Check the DB
        SELECT * FROM circulation_rules WHERE branchcode = 'BRANCHCODE'
        using the branchcode for the library you chode
     5 - Note returnbranch, and hold_fulfillment_policy rules exist with blank value
     6 - Set 'All libraries'->'Default checkout, hold and return policy'->'Item floats'
     7 - Checkin an item from the library with blank rules at another library
     8 - It returns home rather than floating
     9 - Apply patch and restart all the things
    10 - Reload the page and save the rules as before
    11 - Check the DB and note the rules no longer exist
    12 - Check in the item, it floats!
    13 - prove -v t/db_dependent/Koha/CirculationRules.t

    Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.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 ab6494fc3de5fc4f325941baf1c65f67634b1c1b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Oct 9 11:04:19 2020 +0000

    Bug 23420: DBRev 20.06.00.047

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

commit fc022ab894d863dc660ca57b2d45543a3b4445ec
Author: Lucas Gass <lucas at bywatersolutions.com>
Date:   Mon Oct 5 17:42:29 2020 +0000

    Bug 23420: (QA follow-up) Remove more AllowPurchaseSuggestionBranchChoice code

    Test plan:
    1. git grep -i AllowPurchaseSuggestionBranchChoice **/*.pm **/*.pl **/*.t
    2. There should no longer be any code related to the old sys pref AllowPurchaseSuggestionBranchChoice

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

commit 12253d53821b6764e2084db85eb0b56a72a3694c
Author: Lucas Gass <lucas at bywatersolutions.com>
Date:   Wed Sep 23 23:00:07 2020 +0000

    Bug 23420: (QA follow-up) Remove AllowPurchaseSuggestionBranchChoice syspref

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

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

commit b7d31ef16dd25e025a72397b8eaf2a218f21e2f7
Author: Lucas Gass <lucas at bywatersolutions.com>
Date:   Fri Sep 18 22:17:58 2020 +0000

    Bug 23420: Add OPACSuggestionUnwantedFields system pref

    To test:
    -Apply patch
    -Check OPACSuggestionUnwantedFields
    -Check some fields as unwanted
    -Go to the OPAC suggestion page and make sure these correct fields are hidden
    -Turn on the system preference AllowPurchaseSuggestionBranchChoice to see the branch choice on the form
    -Make sure you can correctly hide this one and still submit the purchase suggestion for without error.
    -Go through each option and make sure it hides properly.

    Note: You will only see the patron reason field when there are authorised values in the OPAC_SUG category

    Signed-off-by: David Nind <david at davidnind.com>

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

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

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

Summary of changes:
 C4/UsageStats.pm                                   |   1 -
 Koha.pm                                            |   2 +-
 Koha/CirculationRules.pm                           |   5 +
 admin/smart-rules.pl                               |   5 -
 circ/branchtransfers.pl                            |   2 -
 installer/data/mysql/sysprefs.sql                  |   2 +-
 installer/data/mysql/updatedatabase.pl             |  40 +++++
 .../prog/en/modules/admin/preferences/opac.pref    |  23 ++-
 .../prog/en/modules/circ/branchtransfers.tt        |  10 +-
 .../bootstrap/en/modules/opac-suggestions.tt       | 186 ++++++++++++---------
 opac/opac-suggestions.pl                           |  24 ++-
 t/db_dependent/Koha/CirculationRules.t             |  27 ++-
 t/db_dependent/UsageStats.t                        |   1 -
 tools/viewlog.pl                                   |   2 +-
 14 files changed, 204 insertions(+), 126 deletions(-)

hooks/post-receive
-- 
main Koha release repository