[koha-commits] main Koha release repository branch master updated. v17.11.00-669-gae7f0ae
Git repo owner
gitmaster at git.koha-community.org
Fri Feb 16 18:13:37 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, master has been updated
via ae7f0ae4b51ec1b9cba2643a580d4bb622cd60b9 (commit)
via 4bd62d0a8c5f78d31ef12fdca856af76bdf13809 (commit)
via 37ed1111cee60c519f844c789d4385eacd299fbb (commit)
via b3434ebb3d6cb83d2e7b2cf063d75f78f07e3695 (commit)
via f88a68e993f65bae4bf33726978c64c41eebba5e (commit)
via 9a6ef80a3d8a2e77673afd820d712e3582e81704 (commit)
via 4339291f44d51accc891c99cf2eb4d68cdc3fa19 (commit)
via 427b9a70ba40fef46042f31b0972dc17b6139442 (commit)
via 2b07298991a78f21486f5b2f61e1d812c4939c3e (commit)
via bd122369dcdc69bde1c66d2aecc2e0b4bcc744b4 (commit)
via 29e429171899d825099ec8f9a22ffebb761db3fd (commit)
via 2cd0f388fa5e6bf21a1608cb548157485c060392 (commit)
via 8f8eb35c2f6d56dfd332cbe6212db75aae8b8f50 (commit)
via b361ff2d7d1d9e0f27ff3d6b728686bc3691c564 (commit)
via c9c0697ca54fa274c1e361ff2c28459069943ad1 (commit)
via 70c45c37813860652914a381195f976c554b71d9 (commit)
via e1476578f20b1c1f84f2edf241dbb0d1eea565fe (commit)
via c2066bcadc3b691b4cbf3684c72e9d57e5989d81 (commit)
via 97bfd4be33773ee18882edb004c8a7a5a8629169 (commit)
via 249736a67f7ed0e2130c620e10bcbc01b14b1829 (commit)
via 0b2c4ff551bb29db15813d91cfb5e74de1061683 (commit)
via 36bd68842f13714638a1ed8aa93bef0672685d38 (commit)
via 5008ccd11e0255f85e68195586591f2715c4cbd5 (commit)
via e8ff7ccd5fcae69834a75dd11ef62b6092606015 (commit)
via c6058953da3a486fbf09aa8950c68c62a532c802 (commit)
via 9c8b420dd72cb58fbdf1eada88a6ee6127f6068b (commit)
via 146faf5d6783c95e91fba5456d2e9badd7a8c3d5 (commit)
via 5bb01c86161741297c177b41b36d7a15f4d1c61a (commit)
via 8eb00d2cbbcdfe8af1e2c7df59ac9673c248fbf9 (commit)
via 7d9ba0d1b410385d8867ed1b6ac08cdb37c53e6a (commit)
via 105b3e10e8b31b7de6d733e676c3e661a39b1280 (commit)
via c49bffda19d64090e897a4c83ca50548175dde62 (commit)
via 43b60d6eed5a028fcc629b7db8b33e93d1dd680b (commit)
via 6f9c5d45a41e0e6078e927cb829ef9861ecb613b (commit)
via 9773923bc0e68401702e568dc67948df72cc300f (commit)
via 2ee70dd0826a7adc0a1f35973dec3bed9f0f6c58 (commit)
via 82474cad8437a29bd279e57b9d4c1332674a5301 (commit)
via a723bbaf1b564bf18ec9f477a3269b8b17033639 (commit)
via d8b8799355596a960d3c2cabf6bf4e7a04cef00c (commit)
via e5f70a6010ec08243b6aee09054f8de33577c7cd (commit)
via b4c23e1a3e6ed5299cf41c9a29432b13f57654ff (commit)
via ab47e46ea0ade643b308a8b00708d57995c57050 (commit)
via 0ab22e1c7c6b6e8d14a4fb7478ab2a3d42da347d (commit)
via 265070081aa32a6b7fa703bcf3ebf9f357e95cd8 (commit)
via 795aeaefffdea1e3aa20befe96cc1383f707caf9 (commit)
via 216b0cff0de168ce95f11b648c2e794083a00874 (commit)
via eac8f7d9ac11e6a20d0e3ecf0986edb9a270415f (commit)
via 524eab678833b2719187e67128ee4f83a2a48ba4 (commit)
from fd70cdcc31021457285c68633a50499bf4b6bfe6 (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 ae7f0ae4b51ec1b9cba2643a580d4bb622cd60b9
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Jan 17 14:33:33 2018 -0300
Bug 19686: (follow-up) Add to_api param for completeness
This patch adds (yet) another param to objects.search: a reference
to a to_api function to be applied when processing the search results
for output.
To test:
- Apply this patch
- Run:
$ kshell
k$ prove t/db_dependent/Koha/REST/Plugin/Objects.t
=> SUCCESS: Test count raised, and tests pass!
- Sign off :-D
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 4bd62d0a8c5f78d31ef12fdca856af76bdf13809
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Nov 23 17:10:42 2017 -0300
Bug 19686: Add objects.search a 'to_model' param
This patch introduces a new parameter to the objects.search Mojo helper.
The idea behind this, is that if there's any attribute name mapping
between the DB objects and the API exposed ones, we should be able to
pass it to objects.search so the filtering query params are mapped
correctly for building the DBIC query, like this example:
my $patrons_set = Koha::Patrons->new;
my @patrons = $c->objects->search( $patrons_set,
\&to_model
)->as_list;
# and probably
@patrons = map {to_api($_)} @patrons;
The to_model function needs to avoid autovivification, to prevent
messing with the query parameters (undef params).
To test:
- Apply this patches
- Run:
$ kshell
k$ prove t/db_dependent/Koha/REST/Plugin/Objects.t
=> SUCCESS: Tests pass! Params get mapped!
- Sign off :-D
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: David Bourgault <david.bourgault at inlibro.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 37ed1111cee60c519f844c789d4385eacd299fbb
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Nov 23 17:10:13 2017 -0300
Bug 19686: Unit tests
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: David Bourgault <david.bourgault at inlibro.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit b3434ebb3d6cb83d2e7b2cf063d75f78f07e3695
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Jan 10 17:19:57 2018 +0000
Bug 19947: Update popup window templates to use Bootstrap grid: Acquisitions transfer order
This patch updates the acquisitions transfer order template to use the
Bootstrap grid instead of the YUI grid.
Also fixed: Corrected footer include for popup window.
To test, apply the patch and go to Acquisitions -> Vendor -> Open order
-> Transfer.
In the popup window search for a vendor, select, and choose a basket.
Signed-off-by: Charlotte Cordwell <charlotte.cordwell123 at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit f88a68e993f65bae4bf33726978c64c41eebba5e
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Feb 7 14:24:04 2018 +0000
Bug 19932: (follow-up) Add fixed footer to cataloging Z39.50 popup
This patch adds additional Bootstrap framework markup to the search form
so that the "Save" and "Cancel" controls are in a fixed footer at the
bottom of the window. This prevents the controls from disappearing down
off screen.
To test, apply the patch and go to Cataloging -> New from Z39.50/SRU.
In the popup window, both the search form and search results pages
should look correct.
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: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9a6ef80a3d8a2e77673afd820d712e3582e81704
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Jan 9 13:49:02 2018 +0000
Bug 19932: Update popup window templates to use Bootstrap grid: Cataloging Z39.50 search
This patch updates the cataloging Z39.50 search template to use the
Bootstrap grid instead of the YUI grid.
Also fixed: Several un-quoted HTML attributes have been corrected.
To test, apply the patch and go to Cataloging -> New from Z39.50/SRU.
In the popup window, both the search form and search results pages
should look correct.
Signed-off-by: Zoe Bennett <zoebennett1308 at gmail.com>
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: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 4339291f44d51accc891c99cf2eb4d68cdc3fa19
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Feb 16 12:01:36 2018 +0100
Bug 20227: Check for categorycode in default_borrower_circ_rules
Fixes silent crash when adding the same category twice.
DBD::mysql::st execute failed: Duplicate entry 'ST' for key 'PRIMARY' [for Statement "
INSERT INTO default_borrower_circ_rules
(categorycode, maxissueqty, maxonsiteissueqty, max_holds)
VALUES (?, ?, ?, ?)
" with ParamValues: 0="ST", 1=undef, 2=undef, 3="3"] at /usr/share/koha/devclone/admin/smart-rules.pl line 309.
(Line number affected by bug 15524.)
Very trivial solution.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 427b9a70ba40fef46042f31b0972dc17b6139442
Author: Kyle M Hall <kyle at bywatetsolutions.com>
Date: Fri Feb 16 08:43:32 2018 -0500
Bug 12598: Fix POD
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 2b07298991a78f21486f5b2f61e1d812c4939c3e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jan 4 10:06:17 2018 -0300
Bug 12598: Use Pod::Usage and make the help more explicit
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit bd122369dcdc69bde1c66d2aecc2e0b4bcc744b4
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jan 4 10:05:46 2018 -0300
Bug 12598: Remove warnings from tests and make them pass
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 29e429171899d825099ec8f9a22ffebb761db3fd
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 29 10:31:08 2017 -0300
Bug 12598: Add use Koha::Patron::debarments statement
Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 2cd0f388fa5e6bf21a1608cb548157485c060392
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 22 13:34:17 2017 -0300
Bug 12598: Re-add bug 18555: Create patron list from patron import
Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 8f8eb35c2f6d56dfd332cbe6212db75aae8b8f50
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Thu Aug 10 13:56:24 2017 +0100
Bug 12598: Allow matched patron to be updated
When a test was introduced to not add duplicate userids
it overlooked that if you were matching on userid you
do not want the update to be rejected.
Add a test to overcome this logical flaw if updating
by matching userid
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit b361ff2d7d1d9e0f27ff3d6b728686bc3691c564
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jul 25 10:19:20 2017 -0300
Bug 12598: Re-add some missing stuffs
This patch will have to be squashed with previous ones, but for
readability I prefer to let it alone for now.
It reintroduces 2 missing changes:
commit fd123903651435c56ca14d88897e9ce4d7a38bb5
Bug 15010: Import patron tool creates 'duplicate' restrictions (
debarments )
commit 011d8e9855ffeb1779f5c1aadc9f4367c298cee7
Bug 12543 - Add userid as matchpoint for "Import patrons" tool
Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit c9c0697ca54fa274c1e361ff2c28459069943ad1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jul 25 10:10:54 2017 -0300
Bug 12598: Fix conflict with 17829 - GetMember
Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 70c45c37813860652914a381195f976c554b71d9
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jul 6 12:49:01 2017 -0300
Bug 12598: Fix conflict with bug 16911
Tests will have to be written for this change
Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit e1476578f20b1c1f84f2edf241dbb0d1eea565fe
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jun 1 10:12:48 2017 -0300
Bug 12598: Update code to use new modules
Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit c2066bcadc3b691b4cbf3684c72e9d57e5989d81
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Jul 21 13:50:08 2014 -0400
Bug 12598: New misc/import_borrowers.pl command line tool
Test Plan:
1) Apply this patch
2) Test importing patrons from command line,
options are availble with --help.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Tested with minimal csv
(cardnumber,surname,firstname,categorycode,branchcode,password,userid)
Overwrite does not change category or branch.
Patrons are loaded, userid & password works
Updated license to GPLv3
No other koha-qa errors.
Signed-off-by: Benjamin Rokseth <benjamin.rokseth at kul.oslo.kommune.no>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Bug 12598 - Tidy import_borrowers.pl
Signed-off-by: Benjamin Rokseth <benjamin.rokseth at kul.oslo.kommune.no>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Bug 12598 - Move importing code to a subroutine
Signed-off-by: Benjamin Rokseth <benjamin.rokseth at kul.oslo.kommune.no>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Bug 12598 - Update command line script to use patron import subroutine
Signed-off-by: Benjamin Rokseth <benjamin.rokseth at kul.oslo.kommune.no>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Bug 12598 [QA Followup]
* Fix copyright on import_borrowers.pl
* Changes -c --csv to -f --file
* Adds -c --confirm option
* Renames misc/import_borrowers.pl to misc/import_patrons.pl
* Restore userid matchpoint option
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Bug 12598 - Fix merge to master. Backport 3 updates from latest import_borrowers.pl
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Bug 12598 - Started regression tests. Fix missing C4::Members::Attributes package
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Bug 12598 - More refactoring and regression tests in Koha::Patrons::Import
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Bug 12598 - Creating objects in misc/import_patrons.pl and tools/import_borrowers.pl
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Bug 12598 - Refactoring Koha::Patrons::Import includes bug fixed for critical date types and header column parsing
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Bug 12598 - Rebase + backport of 16426 plus fixing 16426
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Bug 12598: catch warnings raised by import_patrons in tests
Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 97bfd4be33773ee18882edb004c8a7a5a8629169
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Feb 16 13:57:07 2018 -0300
Bug 18789: Add POD for is_adult and is_child
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 249736a67f7ed0e2130c620e10bcbc01b14b1829
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Fri Feb 16 11:00:25 2018 +0000
Bug 18789: (QA follow-up) Fix viewlog when accessed via circulation
Test plan:
Go to any patron and then to Modification log of this patron
-- without patch you will not see the left side menu and patron information
-- with patch menu and patron information is here, and should be fully
working (links)
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 0b2c4ff551bb29db15813d91cfb5e74de1061683
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Fri Feb 16 10:58:42 2018 +0000
Bug 18789: (QA follow-up) Update holdshistory.pl, fix is_child, is_adult, patron->image, clear template params
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 36bd68842f13714638a1ed8aa93bef0672685d38
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Fri Feb 16 10:57:15 2018 +0000
Bug 18789: (QA follow-up) Use is_child in circulation.pl
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 5008ccd11e0255f85e68195586591f2715c4cbd5
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Fri Feb 16 10:15:14 2018 +0000
Bug 18789: (QA follow-up) Use patron object in batch checkout template
1) Enable batch checkouts in system preferences and set it on for some
patron categories
2) Try to batch checkout for some patron with one of these categories
--> without patch the batch checkout page is even not shown
--> with patch batch checking out is working as expected
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit e8ff7ccd5fcae69834a75dd11ef62b6092606015
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Fri Feb 16 10:00:22 2018 +0000
Bug 18789: (QA follow-up) Fix showing cardnumber when creating a hold
Test plan:
1) Try to create a hold request for a patron
2) On place hold form on the first line is shown the patron name
--> without patch the cardnumber is not shown
--> with patch there is cardnumber right after the patron name
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit c6058953da3a486fbf09aa8950c68c62a532c802
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Fri Feb 16 09:57:48 2018 +0000
Bug 18789: (QA follow-up) Fix showing patron name when checking in
Test plan:
1) Have a patron with more then one checkouts
2) Check in one of the checkouts
--> without patch patron name is not shown in checked-in items table
--> with patch the patron is shown with name, category, number of
checkouts and both links are working
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9c8b420dd72cb58fbdf1eada88a6ee6127f6068b
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Fri Feb 16 09:01:26 2018 +0000
Bug 18789: (QA follow-up) Fix loading saved address data to edit patron form
Test plan:
1) Have patron with address filled in
2) Edit the patron
-- without this patch the fields for address are blank
-- with patch the fields are filled with actual data
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 146faf5d6783c95e91fba5456d2e9badd7a8c3d5
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Fri Feb 16 08:15:31 2018 +0000
Bug 18789: (QA follow-up) Use first_valid_email_address on Tranfers to receive page
For consistancy with waitng reserves
Test plan:
1) Have a hold for patron which need to be transfered, inititate
transfer and go to target library
2) Go to Circulation -> transfers to receive page and you should see any
first valid email for tha patron in column "On hold for"
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 5bb01c86161741297c177b41b36d7a15f4d1c61a
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Fri Feb 16 08:02:39 2018 +0000
Bug 18789: (QA follow-up) Fix showing the name of basket creator on booksellers page
Test plan:
1) Go to Acquisition and search for a vendor, you are presented with vendors and their baskets
2) Look to Created by column
--> without patch only firstname is shown
--> with patch you should see full name
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 8eb00d2cbbcdfe8af1e2c7df59ac9673c248fbf9
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Fri Feb 16 07:46:49 2018 +0000
Bug 18789: (QA follow-up) Fix borrowernumber in menu item links
Test plan:
Go to patrons routing list
Try to click Holds history or ILL requests menu link
--> without page blank page
--> with page desired page
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 7d9ba0d1b410385d8867ed1b6ac08cdb37c53e6a
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Fri Feb 16 07:45:35 2018 +0000
Bug 18789: (QA follow-up) Fix tab char
Test plan:
run koha qa tools, should be green
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 105b3e10e8b31b7de6d733e676c3e661a39b1280
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Feb 15 15:06:04 2018 -0300
Bug 18789: Use the patron variable in circulation.[pl|tt]
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit c49bffda19d64090e897a4c83ca50548175dde62
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Feb 15 14:10:13 2018 -0300
Bug 18789: Add tests for is_adult and is_child
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 43b60d6eed5a028fcc629b7db8b33e93d1dd680b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Feb 7 15:54:31 2018 -0300
Bug 18789: (follow-up) Use Koha::Patron->image from the templates
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 6f9c5d45a41e0e6078e927cb829ef9861ecb613b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jun 12 14:20:26 2017 -0300
Bug 18789: (follow-up) Send Koha::Patron object to the templates
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9773923bc0e68401702e568dc67948df72cc300f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jun 1 14:03:52 2017 -0300
Bug 18789: Update other occurences where is_child should be used
Trivial changes here, just do a code review on the QA step
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 2ee70dd0826a7adc0a1f35973dec3bed9f0f6c58
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jun 1 13:58:48 2017 -0300
Bug 18789: Remove adultborrower from the pay* scripts
This flag is not used in the templates
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 82474cad8437a29bd279e57b9d4c1332674a5301
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jun 1 13:58:04 2017 -0300
Bug 18789: Remove useless IS_ADULT variable
Test plan:
git grep IS_ADULT
must not return any results
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit a723bbaf1b564bf18ec9f477a3269b8b17033639
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jun 1 13:57:12 2017 -0300
Bug 18789: Use Koha::Patron->is_adult where needed
Test plan:
When editing adult's info you must see the "Add child" button
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d8b8799355596a960d3c2cabf6bf4e7a04cef00c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jun 1 13:52:30 2017 -0300
Bug 18789: Use Koha::Patron->is_child where needed
Test plan:
When you are on a page related to a child you should see the "Update
child to adult patron" button
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit e5f70a6010ec08243b6aee09054f8de33577c7cd
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jun 1 13:51:09 2017 -0300
Bug 18789: Add tests for is_adult and is_child
This patch add 2 methods to the Koha::Patron module: is_adult and
is_child.
That way the business logic is at only one place and covered by tests.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit b4c23e1a3e6ed5299cf41c9a29432b13f57654ff
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jun 1 13:29:45 2017 -0300
Bug 18789: Use Koha::Patron->image from the templates
Now that we have the 'patron' variable in all our templates, we can call
Koha::Patron->image and do the check from the templates.
Test plan:
On the different pages of the patron module, you should see the default
image if there is no image attached or the one that has been attached
(see pref patronimages)
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ab47e46ea0ade643b308a8b00708d57995c57050
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jun 1 13:14:29 2017 -0300
Bug 18789: Pass a Koha::Patron object from returns.pl
This is a specific patch for returns.pl
Test plan:
Do some checkin for a patron and make sure the info are correctly
displayed (and info from someone that has placed a hold on this item)
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 0ab22e1c7c6b6e8d14a4fb7478ab2a3d42da347d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jun 1 14:47:40 2017 -0300
Bug 18789: Send Koha::Patron object to the templates
In order to simplify and make uniform the code, the controller scripts send
a Koha::Patron object to the templates instead of all attributes of a patron.
That will make the code much more easier to maintain and will be less
error-prone.
The variable "patron" sent to the templates is supposed to represent the
patron the librarian is editing the detail.
In the members module and some scripts of the circulation module, the
patron's detail are sent one by one to the template. That leads to
frustration from developpers (making sure everything is passed from all
scripts) and to regression (we got tone of bugs in the last year because
of this way to do).
With this patch set it will be easy access patron's detail, passing only
1 variable from the controllers.
Test plan:
Play with the patron and circulation module and make sur the detail of
the patron you are editing/seeing info are correctly displayed.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 265070081aa32a6b7fa703bcf3ebf9f357e95cd8
Author: Magnus Enger <magnus at libriotech.no>
Date: Thu Feb 15 10:14:56 2018 +0100
Bug 20205: Add IDs to buttons in patron-toolbar.inc
The buttons in patron-toolbar.inc lack unique IDs, making them
hard to style/remove with CSS. This patch adds IDs to all three
buttons.
To test:
- Look in koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc
and verify there are no IDs
- Apply the patch and look at the file again to verify the IDs have
been added
- Test the "New patron" and "Quick add new patron" buttons to verify
they still work as intended
- Check that the new buttons are globally unique:
$ grep -rn "new-patron-button" *
$ grep -rn "patron-lists-button" *
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 795aeaefffdea1e3aa20befe96cc1383f707caf9
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Feb 12 15:37:18 2018 -0300
Bug 20185: Remove warnings from stats.print.pl
This needs a full rewrite!
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 216b0cff0de168ce95f11b648c2e794083a00874
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Feb 12 13:58:28 2018 -0300
Bug 20185: Remove warnings from aqplan.pl
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit eac8f7d9ac11e6a20d0e3ecf0986edb9a270415f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Feb 5 17:06:55 2018 -0300
Bug 20182: [sql_modes] Remove group by clause in search_patrons_to_anonymise
Not trivial, more attention needed on this one!
Fix for:
'koha_kohadev.me.cardnumber' isn't in GROUP BY
Looks like the query is complexified, perf tests needed, see bug 19599.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 524eab678833b2719187e67128ee4f83a2a48ba4
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Feb 5 15:59:09 2018 -0300
Bug 20176: [sql_modes] Set biblio.datecreated to NOW if not defined
Fix at ->store level, this issue appears in lot of places.
Fix for:
Field 'datecreated' doesn't have a default value
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
Koha/Biblio.pm | 14 +
Koha/Patron.pm | 27 +-
Koha/Patrons.pm | 2 +-
Koha/Patrons/Import.pm | 530 ++++++++++++++++
Koha/REST/Plugin/Objects.pm | 31 +-
acqui/acqui-home.pl | 5 +-
acqui/booksellers.pl | 3 +-
admin/aqbudgets.pl | 3 +-
admin/aqplan.pl | 10 +-
admin/smart-rules.pl | 2 +-
circ/branchtransfers.pl | 5 +-
circ/circulation.pl | 9 +-
circ/overdue.pl | 15 -
circ/returns.pl | 50 +-
circ/transferstoreceive.pl | 8 +-
circ/waitingreserves.pl | 6 +-
.../prog/en/includes/borrower_debarments.inc | 4 +-
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 72 +--
.../en/includes/member-alt-address-style-de.inc | 22 +-
.../en/includes/member-alt-address-style-fr.inc | 22 +-
.../en/includes/member-alt-address-style-us.inc | 20 +-
.../en/includes/member-alt-contact-style-de.inc | 18 +-
.../en/includes/member-alt-contact-style-fr.inc | 18 +-
.../en/includes/member-alt-contact-style-us.inc | 18 +-
.../includes/member-display-address-style-de.inc | 20 +-
.../includes/member-display-address-style-fr.inc | 22 +-
.../includes/member-display-address-style-us.inc | 20 +-
.../member-display-alt-address-style-de.inc | 20 +-
.../member-display-alt-address-style-fr.inc | 26 +-
.../member-display-alt-address-style-us.inc | 20 +-
.../en/includes/member-main-address-style-de.inc | 18 +-
.../en/includes/member-main-address-style-fr.inc | 18 +-
.../en/includes/member-main-address-style-us.inc | 18 +-
.../prog/en/includes/members-toolbar.inc | 26 +-
.../prog/en/includes/patron-search.inc | 2 +-
.../prog/en/includes/patron-toolbar.inc | 6 +-
.../prog/en/modules/acqui/acqui-home.tt | 4 +-
.../prog/en/modules/acqui/booksellers.tt | 6 +-
.../prog/en/modules/acqui/transferorder.tt | 13 +-
.../prog/en/modules/admin/aqbudgets.tt | 8 +-
.../prog/en/modules/cataloguing/z3950_search.tt | 53 +-
.../prog/en/modules/circ/branchtransfers.tt | 6 +-
.../prog/en/modules/circ/circulation.tt | 52 +-
.../en/modules/circ/circulation_batch_checkouts.tt | 24 +-
.../prog/en/modules/circ/printslip.tt | 2 +-
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 80 +--
.../prog/en/modules/circ/transferstoreceive.tt | 14 +-
.../prog/en/modules/circ/waitingreserves.tt | 14 +-
.../prog/en/modules/members/boraccount.tt | 10 +-
.../prog/en/modules/members/deletemem.tt | 14 +-
.../prog/en/modules/members/discharge.tt | 8 +-
.../prog/en/modules/members/housebound.tt | 16 +-
.../prog/en/modules/members/mancredit.tt | 12 +-
.../prog/en/modules/members/maninvoice.tt | 12 +-
.../prog/en/modules/members/member-flags.tt | 10 +-
.../prog/en/modules/members/member-password.tt | 14 +-
.../prog/en/modules/members/memberentrygen.tt | 2 +-
.../prog/en/modules/members/moremember-print.tt | 20 +-
.../prog/en/modules/members/moremember.tt | 124 ++--
.../intranet-tmpl/prog/en/modules/members/pay.tt | 21 +-
.../prog/en/modules/members/paycollect.tt | 26 +-
.../prog/en/modules/members/printfeercpt.tt | 9 +-
.../prog/en/modules/members/printinvoice.tt | 9 +-
.../en/modules/members/purchase-suggestions.tt | 2 +-
.../prog/en/modules/members/readingrec.tt | 4 +-
.../prog/en/modules/members/routing-lists.tt | 4 +-
.../prog/en/modules/reserve/request.tt | 50 +-
.../prog/en/modules/reviews/reviewswaiting.tt | 2 +-
.../prog/en/modules/tools/import_borrowers.tt | 440 ++++++++------
.../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 14 +-
members/boraccount.pl | 11 +-
members/deletemem.pl | 21 +-
members/discharge.pl | 28 +-
members/files.pl | 11 +-
members/holdshistory.pl | 9 +-
members/housebound.pl | 13 +-
members/mancredit.pl | 10 +-
members/maninvoice.pl | 11 +-
members/member-flags.pl | 29 +-
members/member-password.pl | 31 +-
members/memberentry.pl | 1 +
members/moremember.pl | 26 +-
members/notices.pl | 7 +-
members/pay.pl | 18 +-
members/paycollect.pl | 11 +-
members/printfeercpt.pl | 29 +-
members/printinvoice.pl | 28 +-
members/purchase-suggestions.pl | 10 +-
members/readingrec.pl | 34 +-
members/routing-lists.pl | 19 +-
members/statistics.pl | 13 +-
members/summary-print.pl | 9 +-
misc/import_patrons.pl | 142 +++++
opac/opac-detail.pl | 2 +-
opac/opac-reserve.pl | 4 -
reports/stats.print.pl | 10 +-
reserve/request.pl | 22 +-
reviews/reviewswaiting.pl | 3 +-
t/db_dependent/Koha/Biblios.t | 15 +-
t/db_dependent/Koha/Patrons.t | 69 ++-
t/db_dependent/Koha/Patrons/Import.t | 633 ++++++++++++++++++++
t/db_dependent/Koha/REST/Plugin/Objects.t | 111 +++-
tools/import_borrowers.pl | 340 ++---------
tools/viewlog.pl | 23 +-
104 files changed, 2475 insertions(+), 1507 deletions(-)
create mode 100644 Koha/Patrons/Import.pm
create mode 100755 misc/import_patrons.pl
create mode 100644 t/db_dependent/Koha/Patrons/Import.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list