[koha-commits] main Koha release repository branch 17.05.x updated. v17.05.09-19-g5f446a5
Git repo owner
gitmaster at git.koha-community.org
Tue Mar 27 14:10:10 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, 17.05.x has been updated
via 5f446a5f0aa4a05f5502e8562c9bdd5552dc1597 (commit)
via 900c11e25a6038990bc0c3102b74b8599659cead (commit)
via fa20c7a4f562bd3ff3952276f62c6b5e4e7f85c4 (commit)
via 1664e8080157461db9eae73e076806f4e41e712b (commit)
via 7616fa9dcd310845d05f13c2f9847223e14b508f (commit)
via 338674817621f542ee122b8e6b7c2f374c50ce1d (commit)
via 88758966cdd3c5d1e6f3e1db2b91aefd6e45036a (commit)
via f6c4a1c3c4ada7bf7307bbc6d3ba1d094cac7539 (commit)
via c04a87e34f62ea7985fd161677fba4472a878434 (commit)
via e89ee572633e220cd027e460d5709852dbdd0331 (commit)
via cdce1d8f397cf42f971fb14031c85142b0a11bce (commit)
via ac54d831df9d865f600f20e42ef29a7a2833bd4c (commit)
via da33f365debdd09c8f9b8af2ca904d2f72d3c062 (commit)
from 5eb8bcb4eafa9fb717f24a34c245025f81d1a85b (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 5f446a5f0aa4a05f5502e8562c9bdd5552dc1597
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Mar 23 13:13:16 2018 -0300
Bug 20466: Fix fixture syntax in t/Prices.t
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 00c9f9b0ea0179d8623bf350a7961a8cd75c5348)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 900c11e25a6038990bc0c3102b74b8599659cead
Author: Lari Taskula <lari.taskula at jns.fi>
Date: Fri Mar 9 15:49:27 2018 +0200
Bug 20367: Avoid resetting userid when BorrowerUnwantedField contains userid
To test:
1. In staff client, set your username to firstname
2. Add userid to BorrowerUnwantedField system preference
3. Go to your patron modification screen (memberentry.pl) and click Save
4. Observe you get kicked out into login screen, saying:
Error: You do not have permission to access this page.
Log in as a different user
5. Apply patch and restart plack
6. Set your username back to firstname
7. Repeat step 3
8. Observe you were not kicked out and your userid stays the same
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
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>
(cherry picked from commit 7e44bb803fa085abdbded2311325f0c442b17708)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit fa20c7a4f562bd3ff3952276f62c6b5e4e7f85c4
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Mon Mar 5 13:36:50 2018 -0300
Bug 20167: Make changing a hold pass the itemnumber to ModReserve
If you have an item-level hold, changing an attribute (like priority,
pickup location or suspended until date) makes the hold a biblio-level
hold, because ModReserve is not passed the current itemnumber.
This patch uses the hold's itemnumber and passes it to the ModReserve
call.
To test:
- Run the regression tests from the previous patch:
$ kshell
k$ prove t/db_dependent/api/v1/holds.t
=> FAIL: Tests fail
- Apply this patch
- Run the tests:
$ kshell
k$ prove t/db_dependent/api/v1/holds.t
=> SUCCESS: Tests pass!
- Sign off :-D
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit e854b570021784d8e6ce8bb9d90e0b02d6f8c9a7)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 1664e8080157461db9eae73e076806f4e41e712b
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Mon Mar 5 13:35:33 2018 -0300
Bug 20167: Regression test
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Conflicts:
t/db_dependent/api/v1/holds.t
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 705deb2aa4bdadbd583bcf322cf0611303725b05)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 7616fa9dcd310845d05f13c2f9847223e14b508f
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Feb 16 12:31:39 2018 +0000
Bug 20218: Fix matching of uri in tracklinks
The current code matches using a regex, this breaks when the url
contains special characters. We swtich it to equality check
To test:
1 - Enable TrackClicks (either track or anonymous)
2 - Find the URL of a biblio in the OPAC
3 - Paste this into the 856$u of another record
(or use any url containing a '?' or other characters)
4 - View the record in the opac
5 - Click the URL
6 - 404 Error!
7 - Apply patch
8 - Try again
9 - Success!
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
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>
(cherry picked from commit 306b461a6a8e57814367de524dfa3bd22c2f3eca)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 338674817621f542ee122b8e6b7c2f374c50ce1d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Feb 27 11:40:13 2018 -0300
Bug 19979: ->count can be called directly on Koha::Objects
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit f20b91d61b0cfbce6d036b94c08f169bde21bdb2)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 88758966cdd3c5d1e6f3e1db2b91aefd6e45036a
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Tue Jan 16 14:28:36 2018 +0100
Bug 19979: Fix get_facets_info test in Search.t
The test should remove the holdingbranch key in the expected results when
there is only one branch.
See the logic in C4::Koha.
Test plan:
[1] Run Search.t on a database with multiple branches.
[2] Run Search.t on a database with one branch. Without this patch the test
would fail: Failed test '_get_facets_info returns the correct data'.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 254684c3ed70f1f07023a9a1ebd8d078dcb633dc)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit f6c4a1c3c4ada7bf7307bbc6d3ba1d094cac7539
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Feb 19 17:40:06 2018 -0300
Bug 20250: (bug 19529 follow-up) Prevent NoIssuesChargeGuarantees.t to fail randomly
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Conflicts:
t/db_dependent/Circulation/NoIssuesChargeGuarantees.t
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit b671510474fc00e82d5dbec0ff59c92bea7bcb31)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit c04a87e34f62ea7985fd161677fba4472a878434
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Oct 25 13:16:53 2017 -0300
Bug 19529: Prevent NoIssuesChargeGuarantees.t to fail randomly
Use a categorycode != "X"
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 667c07e0480825da10fa9dba4ae9e9625be51d99)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit e89ee572633e220cd027e460d5709852dbdd0331
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sun Feb 18 15:10:30 2018 -0300
Bug 20148: Prevent adding same user multiple times to an order
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 802c81ce1afadefd01f9959c3823b2cd7dc3ba3e)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit cdce1d8f397cf42f971fb14031c85142b0a11bce
Author: Pasi Kallinen <pasi.kallinen at joensuu.fi>
Date: Wed Feb 7 09:45:20 2018 +0200
Bug 20148: Prevent adding same user multiple times to acq basket
When adding a user to manage acquisitions basket, it is possible
to add the same user multiple times. Prevent that.
Test plan:
1) Go to Home -> Acquisitions -> [bookseller] -> [basket]
2) On the "Add user" in the Managed by-part, and try adding
the same user multiple times.
3) Apply patch
4) Repeat 1 and 2. You should now get an error message saying
the user is already in the list.
Signed-off-by: Pasi Kallinen <pasi.kallinen at joensuu.fi>
Signed-off-by: Roch D'Amour <roch.damour at inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Conflicts:
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 757c9b4231399ca6082a00b66beca8e59c0b462b)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit ac54d831df9d865f600f20e42ef29a7a2833bd4c
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Oct 12 13:13:41 2017 +0200
Bug 19452: [17.05.x] Remove the truncate option
The truncate option is not really useful. Its result is probably not what
most users of this script expect or need.
It truncates both tables borrower_message_preferences and
borrower_message_transport_preferences. This (unfortunately) includes
deleting messaging preferences for patron categories. After that, adding
preferences again will not add categories again, but only borrower
preferences which are all disabled.
Furthermore, we do not need to disable the foreign key check. Neither
do we actually need to truncate, deleting records seems sufficient.
Also deleting transport preferences is not needed, since it will be
done by a cascade from messaging preferences. Note that the subsequent
call of SetMessagingPreferencesFromDefaults will already delete the
records.
This makes it possible to remove the truncate option altogether.
Test plan:
[1] Select a patron category (say ST) and change days_in_advance to x.
[2] Select a ST patron and set days_advance to y in his msg prefs.
[3] Run borrowers-force-messaging-defaults.pl -doit
[4] Verify that the patron has been reset to the default prefs (incl.
value x in days_in_advance).
[5] Verify that the patron category prefs are still intact.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Charles Farmer <charles.farmer at inLibro.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit da33f365debdd09c8f9b8af2ca904d2f72d3c062
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Feb 14 15:15:39 2018 -0300
Bug 20145: Do not insert 0000-00-00 in patron tests (and more)
We should call Koha::Patron->is_expired in CanBookBeIssued instead of
doing the same calculation.
Tests have been adapted to pass with new SQL modes.
We should not need to update the values in DB, we already have
Bug 14717: Prevent 0000-00-00 dates in patron data (3.21.00.023)
Test plan:
prove t/db_dependent/Circulation/dateexpiry.t
prove t/db_dependent/Koha/Patrons.t
must return green
Signed-off-by: Roch D'Amour <roch.damour at inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Conflicts:
C4/Circulation.pm
t/db_dependent/Koha/Patrons.t
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 9f075a4fdb2649493820ffed20a352add02c05ea)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 14 ++++----------
C4/Utils/DataTables/Members.pm | 3 ++-
Koha/Patron.pm | 4 ++--
Koha/REST/V1/Hold.pm | 1 +
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 2 +-
.../prog/en/modules/acqui/neworderempty.tt | 2 +-
members/memberentry.pl | 2 +-
.../maintenance/borrowers-force-messaging-defaults | 20 +++-----------------
opac/tracklinks.pl | 2 +-
t/Prices.t | 2 +-
.../Circulation/NoIssuesChargeGuarantees.t | 5 +++++
t/db_dependent/Circulation/dateexpiry.t | 4 ++--
t/db_dependent/Koha/Patrons.t | 8 ++------
t/db_dependent/Search.t | 4 ++++
t/db_dependent/api/v1/holds.t | 5 +++--
15 files changed, 33 insertions(+), 45 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list