[koha-commits] main Koha release repository branch 17.11.x updated. v17.11.03-14-g7e44bb8
Git repo owner
gitmaster at git.koha-community.org
Fri Mar 23 12:19:30 CET 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.11.x has been updated
via 7e44bb803fa085abdbded2311325f0c442b17708 (commit)
via ff2b9b63b46e035caa7b96dbf1b7a4f1435e7c6f (commit)
via 4b69178abac156110d5d92342cec045ea1e304a2 (commit)
via e854b570021784d8e6ce8bb9d90e0b02d6f8c9a7 (commit)
via 705deb2aa4bdadbd583bcf322cf0611303725b05 (commit)
via 306b461a6a8e57814367de524dfa3bd22c2f3eca (commit)
via d088816f8a833358557454e84bdbf04a0b7f3232 (commit)
via f20b91d61b0cfbce6d036b94c08f169bde21bdb2 (commit)
via 254684c3ed70f1f07023a9a1ebd8d078dcb633dc (commit)
via b671510474fc00e82d5dbec0ff59c92bea7bcb31 (commit)
via 802c81ce1afadefd01f9959c3823b2cd7dc3ba3e (commit)
via 757c9b4231399ca6082a00b66beca8e59c0b462b (commit)
via 241c75575e91643c6eef0d71c5f34151e8b30431 (commit)
via 9f075a4fdb2649493820ffed20a352add02c05ea (commit)
from 71c81423dd10447e7179e28a5423eb95e15fb416 (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 7e44bb803fa085abdbded2311325f0c442b17708
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>
commit ff2b9b63b46e035caa7b96dbf1b7a4f1435e7c6f
Author: Jose Martin <jose.i.martin.cuesta at gmail.com>
Date: Wed Mar 7 15:21:39 2018 +0300
Bug 20348: SIP2 patron identification fails to use userid
Replaces "or" with "||" in variable assignment
second attempt to retrieve borrower was not being executed due
to changed precedence
Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 4b69178abac156110d5d92342cec045ea1e304a2
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Feb 27 15:54:38 2018 -0300
Bug 20303: Do not explode when receiving an order if authorisedby not set
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
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>
commit e854b570021784d8e6ce8bb9d90e0b02d6f8c9a7
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>
commit 705deb2aa4bdadbd583bcf322cf0611303725b05
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>
commit 306b461a6a8e57814367de524dfa3bd22c2f3eca
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>
commit d088816f8a833358557454e84bdbf04a0b7f3232
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Wed Feb 14 20:19:01 2018 +0000
Bug 20201: Silence warnings triggered by admin/aqplan.pl
TEST PLAN
---------
0) back up DB
1) Run the following commands on a kohadevbox:
reset_all
git bz apply 20185
echo | sudo tee /var/log/koha/kohadev/plack-error.log
restart_all
2) Navigate in a staff client:
Home -> Administration -> Budgets -> Edit -> Planning by libraries
-- could be any of the planning, but by libraries is nicely visible
on screen.
3) Run the following commands:
cat /var/log/koha/kohadev/plack-error.log
-- several warnings.
4) Run the following commands:
git bz apply 20201
echo | sudo tee /var/log/koha/kohadev/plack-error.log
restart_all
5) repeat step 2 and refresh the staff client page.
-- this time warnings related to aqplan.pl are not there.
6) run koha qa test tools
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Conflicts:
admin/aqplan.pl
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit f20b91d61b0cfbce6d036b94c08f169bde21bdb2
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>
commit 254684c3ed70f1f07023a9a1ebd8d078dcb633dc
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>
commit b671510474fc00e82d5dbec0ff59c92bea7bcb31
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>
commit 802c81ce1afadefd01f9959c3823b2cd7dc3ba3e
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>
commit 757c9b4231399ca6082a00b66beca8e59c0b462b
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>
commit 241c75575e91643c6eef0d71c5f34151e8b30431
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Oct 12 13:13:41 2017 +0200
Bug 19452: [17.11.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: Nick Clemens <nick at bywatersolutions.com>
commit 9f075a4fdb2649493820ffed20a352add02c05ea
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>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 11 ++---------
C4/SIP/ILS/Patron.pm | 2 +-
C4/Utils/DataTables/Members.pm | 3 ++-
Koha/Patron.pm | 4 ++--
Koha/REST/V1/Hold.pm | 1 +
acqui/orderreceive.pl | 8 ++++++--
admin/aqplan.pl | 14 +++++++-------
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 2 +-
.../prog/en/modules/acqui/neworderempty.tt | 2 +-
members/memberentry.pl | 2 +-
.../borrowers-force-messaging-defaults.pl | 20 +++-----------------
opac/tracklinks.pl | 2 +-
.../Circulation/NoIssuesChargeGuarantees.t | 4 ++--
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 +++--
17 files changed, 41 insertions(+), 55 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list