[koha-commits] main Koha release repository branch 17.11.x updated. v17.11.01-32-g5be4704
Git repo owner
gitmaster at git.koha-community.org
Wed Jan 10 14:28:07 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 5be4704347610d269e7d3401f50af46b3202869a (commit)
via 699340a398c3301eb74619c6dd1d18a4cee0951d (commit)
via ad550017ff7618e5e4bdb8686a88710480648864 (commit)
via 4075953c78cf044564c9215c3ea0ecc78789a9e0 (commit)
via 008920eaeb77ffbabece855682e157936bb89c8b (commit)
via 42f20997dfc126bfa1e8e64af70274b39693890a (commit)
via 2b2a031b3adbb1994239cd4aae90665b597e8282 (commit)
via e4aee4b799574736dfe62355e7d78bfa227e85a2 (commit)
via 439a3f43b67be872ace052d9d9aeb8f6ced1c053 (commit)
via 87680805ddb7ebe8dab62cf709ad5e4eebf80726 (commit)
via d5fde992ef04faaa7bd3d32aec57cb76cc4672c7 (commit)
via b59a2c4d1104add61daccbd40562a56e6ffa5a53 (commit)
via ab2a92c6f585a964795ac376e8e8f00220e7a537 (commit)
via 60fa198eab9dcda869ff4703c442c4fe5573c491 (commit)
via 852d36d391f46fec0182716dd5d0f6834ae18fa4 (commit)
via cba47ec34769220a58e87cd801a25fabd774b720 (commit)
via 1db2234423d56203e6ee1e7567b4437bc2d2c1bc (commit)
via a65ff8a7614813d06c25954ca732279a6dc21f05 (commit)
via cd56123068d63033dc07b680c196f78bc256e40b (commit)
via 5ca2b7fedfb13b80b6c453b184474240d4c46a3e (commit)
from 68dd17880fc8c9ddc37da25278f8302f86850925 (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 5be4704347610d269e7d3401f50af46b3202869a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Nov 9 10:34:08 2017 -0300
Bug 19599: Speed anonymise_issue_history up
The query generated by anonymise_issue_history is unecessary complex and
can be very slow on large DB.
With this patch we will execute one query per patron instead.
See patch "Bug 19599: Simplify the query" on the bug report for an
alternative.
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 699340a398c3301eb74619c6dd1d18a4cee0951d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Dec 18 14:27:52 2017 -0300
Bug 19830: Add the Koha::Patron->old_checkouts method
Test plan:
prove t/db_dependent/Koha/Patrons.t
must return green
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ad550017ff7618e5e4bdb8686a88710480648864
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Dec 19 15:04:13 2017 -0300
Bug 19694: Force scalar context for output_pref called with billingdate
If no string is passed to output_pref, it needs to be called in scalar
context (to avoid a shift in the hash elements).
Here we have billingdate that is not defined yet (NULL)
Test plan:
- Search for an existing invoice
- Show details
- Changing shipping cost
- Save
- Verify the new amount is shown
Signed-off-by: Jon Knight <J.P.Knight at lboro.ac.uk>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 4075953c78cf044564c9215c3ea0ecc78789a9e0
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Oct 4 12:10:13 2017 +0000
Bug 18201: Unit tests
To test:
1. prove -v t/db_dependent/Exporter/Record.t
2. Tests should pass/be green/make the day a little brighter
Signed-off-by: Scott Kehoe <scott at masslibsystem.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 008920eaeb77ffbabece855682e157936bb89c8b
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Apr 13 10:21:50 2017 -0400
Bug 18201: Export data -Fix "Remove non-local items" option and add "Removes non-local records" option for existing functionality
It turns out the modules had the option expected built in, we just didn't call
it. This patch set expands the options for passing to the export.
To test:
1 - Go to Tools->Export data
2 - Perform an export and check 'Remove non-local items'
3 - Note that file contains only 'local' records, but includes all items
on those records
4 - Apply patch
5 - Note Tools->Export data has a new option to remove records not owned
by logged in branch
6 - Export as before checking records option, file should be as before
7 - Now check 'Remove items not owned by logged in branch'
8 - File should now only have local items (may have empty records)
9 - Check both boxes and recieve only 'local' records and items
Signed-off-by: Scott Kehoe <scott at masslibsystem.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 42f20997dfc126bfa1e8e64af70274b39693890a
Author: Chris Weeks <chrisweeks at catalyst.net.nz>
Date: Mon Dec 18 22:10:05 2017 +0000
Bug 19510: Add description for edi_manage in acquistion permissions
Test Plan:
1/ Login
2/ Select patrons
3/ Search for a patron by name or card number that exists in the system
4/ Click More -> Set permissions
5/ Expand 'acquistions' and notice that 'edi_manage' has no description
6/ Apply patch
7/ Refresh the permissions page or repeat steps 2 to 5.
8/ Notice that 'edi_manage' now has a description of 'Manage EDIFACT transmissions'
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
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 2b2a031b3adbb1994239cd4aae90665b597e8282
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Fri Dec 15 10:08:11 2017 +0100
Bug 19444: (QA follow-up) Remove repeating condition
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit e4aee4b799574736dfe62355e7d78bfa227e85a2
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Fri Dec 15 09:46:54 2017 +0100
Bug 19444: (QA follow-up) Fix tests for UNIMARC
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 439a3f43b67be872ace052d9d9aeb8f6ced1c053
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Dec 5 10:23:09 2017 -0300
Bug 19444: Display error message for auto_account_expired
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 87680805ddb7ebe8dab62cf709ad5e4eebf80726
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Oct 25 16:51:28 2017 -0300
Bug 19444: Do not auto renew if patron is expired and BlockExpiredPatronOpacActions is set
If the patron's account has expired and BlockExpiredPatronOpacActions is set,
we expect auto renewal to be rejected.
Test plan:
Use the automatic_renewals.pl cronjob script to auto renew a checkout
Before this patch, if the patron's account has expired the auto renew was done.
With this patch, it will only be auto renewed if BlockExpiredPatronOpacActions is not set.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Conflicts:
t/db_dependent/Circulation.t
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit d5fde992ef04faaa7bd3d32aec57cb76cc4672c7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Nov 6 12:22:59 2017 -0300
Bug 19514: Add client-side check
Signed-off-by: David Bourgault <david.bourgault at inlibro.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 b59a2c4d1104add61daccbd40562a56e6ffa5a53
Author: Alex Buckley <alexbuckley at catalyst.net.nz>
Date: Sat Oct 21 00:54:23 2017 +0000
Bug 19514: Implement password restrictions into onboarding tool
Test plan:
1. Drop and recreate your database
2. Restart memcached
3. Go through the web installer
4. In the onboarding tool create a patron with a password of only 2 characters in length
5. Notice the patron is successfully created and no warning message is
displayed
6. Repeat step 1,2,3 and create a patron with a password of 3 characters
none of which are a uppercase letter or number and notice the patron is
successfully created and no warning message is displayed
7. Apply patch
8. Repeat steps 1,2,3 and create a patron with a password consisting of
2 characters, notice that after submitting the form the same form is
loaded again and there is a warning message at the top of the page
informing you the patron wasn't created
9. Repeat steps 1,2,3 and create a patron with a password consisting of
3 characters (all lower case) and submit the form, notice the same form
is reloaded and a warning message at the top of the page informs you
that the patron wasn't created because the password was weak
10. Repeat steps 1,2,3 and create a patron with a password consisting of
3 characters (one lower case letter, one upper case letter and one
number) and submit the form and notice this time the next form in the onboarding is displayed with the message at the top of the screen informing you that the patron was successfully created
Sponsored-By: Catalyst IT
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: David Bourgault <david.bourgault at inlibro.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 ab2a92c6f585a964795ac376e8e8f00220e7a537
Author: David Bourgault <david.bourgault at inlibro.com>
Date: Mon Sep 25 13:05:01 2017 -0400
Bug 11210: Writeoff partial amounts
Minor changes to pay.pl and paycollect.tt to allow writing off a partial amount of a fine.
Test plan:
0) Go to the Fines tab of a test patron's profile
1) Create a fine if there are none (under the Manual invoice tab)
2) Go to the "Pay fines" tab
3) Press the write off button on the corresponding account line
Without patch, you'll be asked to confirm, but will not be able to edit the amount
With patch, you'll be able to edit the amount.
Followed test plan, patch worked as described. Also ran QA test tool and
modified files passed
Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Conflicts:
koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 60fa198eab9dcda869ff4703c442c4fe5573c491
Author: Srdjan <srdjan at catalyst.net.nz>
Date: Thu Oct 12 13:45:43 2017 +1300
Bug 19450: Fixed WebService::ILS bug upstream (0.17)
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 852d36d391f46fec0182716dd5d0f6834ae18fa4
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Tue Nov 7 03:25:52 2017 +0000
Bug 17770: Perltidy
Signed-off-by: Your Full Name <your_email>
Signed-off-by: Jon Knight <J.P.Knight at lboro.ac.uk>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit cba47ec34769220a58e87cd801a25fabd774b720
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Tue Nov 7 03:21:36 2017 +0000
Bug 17770: Improve perlcritic level
before patch: perlcritic -4 noisy
after patch: perlcritic -4 ok
Signed-off-by: Your Full Name <your_email>
Signed-off-by: Jon Knight <J.P.Knight at lboro.ac.uk>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 1db2234423d56203e6ee1e7567b4437bc2d2c1bc
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Mon Nov 6 19:49:27 2017 +0000
Bug 17770: Fix Sitemapper.t if date changes during test run
To compensate, DateTime->now is mocked to the current date.
Signed-off-by: Jon Knight <J.P.Knight at lboro.ac.uk>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit a65ff8a7614813d06c25954ca732279a6dc21f05
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Dec 20 12:32:34 2017 -0300
Bug 19845: Do not generate a password if one is filled on selfreg
Bug 15343 allows patrons to choose their own passwords during self-registration.
But this does not work if the PatronSelfRegistrationVerifyByEmail preference is
set to "Require." If e-mail verification is required, whatever password the patron
supplied in the form is ignored, and they are given a randomly generated password
once they click on the verification link.
Test plan:
1. Make sure there is a valid e-mail stored in the KohaAdminEmailAddress preference.
2. Set PatronSelfRegistration to Allow.
3. Set PatronSelfRegistrationVerifyByEmail to Require.
3. Be sure "password" is listed in PatronSelfRegistrationBorrowerMandatoryField and
NOT listed in PatronSelfRegistrationBorrowerUnwantedField.
4. Be sure there is a valid patron category in PatronSelfRegistrationDefaultCategory.
5. Set PatronSelfRegistrationPrefillForm to "Display and prefill" so that you can see
the generated password.
Then fill out the self-registration form, include a valid e-mail address, and select
a password. Wait for the verification e-mail. Click on the link and you'll see that
the password you entered in the form is used.
Signed-off-by: Arturo <alongoria at sll.texas.gov>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit cd56123068d63033dc07b680c196f78bc256e40b
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Dec 21 09:17:01 2017 -0500
Bug 19669: (QA follow-up) Remove itemstypes.plugin
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 5ca2b7fedfb13b80b6c453b184474240d4c46a3e
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Nov 21 13:56:31 2017 +0000
Bug 19669: Remove deprecated checkouts by patron category report
Patch applies. Reports and general OPAC and staff client functionality is intact.
Signed-off-by: Dilan Johnpullé <dilan at calyx.net.au>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 5 +
C4/InstallAuth.pm | 4 +
C4/Installer/PerlDependencies.pm | 2 +-
Koha/Exporter/Record.pm | 7 +-
Koha/Patron.pm | 18 +-
Koha/Patrons.pm | 13 +-
acqui/invoice.pl | 4 +-
installer/onboarding.pl | 9 +-
.../prog/en/includes/onboarding_messages.inc | 6 +
.../intranet-tmpl/prog/en/includes/permissions.inc | 1 +
.../intranet-tmpl/prog/en/includes/strings.inc | 1 +
.../intranet-tmpl/prog/en/modules/circ/renew.tt | 12 ++
.../prog/en/modules/members/paycollect.tt | 15 +-
.../prog/en/modules/onboarding/onboardingstep3.tt | 3 +
.../modules/reports/issues_by_borrower_category.tt | 92 ---------
.../intranet-tmpl/prog/en/modules/tools/export.tt | 6 +-
koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 7 +
koha-tmpl/intranet-tmpl/prog/js/onboarding.js | 18 ++
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 3 +
members/pay.pl | 2 +-
misc/cronjobs/automatic_renewals.pl | 1 +
opac/opac-memberentry.pl | 2 +-
reports/issues_by_borrower_category.plugin | 218 --------------------
reports/itemtypes.plugin | 109 ----------
t/db_dependent/Circulation.t | 153 +++++++++-----
t/db_dependent/Exporter/Record.t | 69 ++++++-
t/db_dependent/Koha/Patrons.t | 26 ++-
t/db_dependent/Sitemapper.t | 86 ++++----
tools/export.pl | 8 +-
29 files changed, 360 insertions(+), 540 deletions(-)
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tt
delete mode 100755 reports/issues_by_borrower_category.plugin
delete mode 100755 reports/itemtypes.plugin
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list