[koha-commits] main Koha release repository branch master updated. v19.05.00-495-g8437e95
Git repo owner
gitmaster at git.koha-community.org
Tue Aug 13 15:59:00 CEST 2019
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 8437e95faad4a2ad8622067b3ad1a5e00a5084fc (commit)
via 838831b1f7b0799136f49638af4a4bd4faccae15 (commit)
via b5ea03f04fecbacd072f7587c72d7dca4e758d90 (commit)
via bfe89a6aaebde8c42e2f352beaee503f315c1785 (commit)
via e66ccaa3a7743378f906612562889a9476bf6802 (commit)
via 52587b4319d5d22436733f296021648d846f6359 (commit)
via 72197a9574d8b27651a390b9f177a537e1bf994c (commit)
via 06e28c3ac5b708ce01ea1265fa993c1f85e98645 (commit)
via 5c2daf28a5b027187f0e4c29111ed03b1525a33e (commit)
via c6775396c588d507b2a9ebb43b22eb9fbb92fec9 (commit)
via 023cfa76bac099d5b7a14c05577e150b1eff0a32 (commit)
via 9cbaec2a94aaef2d946a6d1dea57af5f9ff4e22c (commit)
via c13de8ca6566c7ad7f6702e6372192765176becd (commit)
via 187b3c553918ae5d737c445762783e9b7fa5580f (commit)
via 90d85eaeb9cd64b7d46078daef727e38d18cf5e1 (commit)
via 0a66d33d8c5d778e3a0961cb5953e2432d9ccb65 (commit)
via 9258d385baa94a00f671dea6315c7738a8f38026 (commit)
via 9f11eef934dcda7cd76176b1a6431d77840b755e (commit)
via 2fade168c81bc05d24164780cbddc100302dd71f (commit)
from b400309ae54a70021fb8bc1414939bbf173551a0 (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 8437e95faad4a2ad8622067b3ad1a5e00a5084fc
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Thu Apr 18 07:21:09 2019 +0000
Bug 16284: Use new method to determine serials in check previous checkouts
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 838831b1f7b0799136f49638af4a4bd4faccae15
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Thu Apr 18 07:19:34 2019 +0000
Bug 16284: Add Koha::Biblio->is_serial method
Test plan:
prove t/db_dependent/Koha/Biblio.t
Should return green
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit b5ea03f04fecbacd072f7587c72d7dca4e758d90
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Tue Apr 16 10:59:43 2019 +0000
Bug 16284: Add test
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit bfe89a6aaebde8c42e2f352beaee503f315c1785
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Thu Jun 22 11:26:53 2017 +0200
Bug 16284: Check only item for previous checkout if biblio is serial
Test plan:
1) Set 'CheckPrevCheckout' system preference to 'Do'
2) Make a checkout with item from serial record (942$s is 1 on default
settings)
3) Return that checkout
4) Try to check it out again, you should see an alert, that the patron
has thi item checked out previously
5) Try to checkout another item from same bibliographic record, you
sholud not see the alert and item should be checked out
6) prove t/db_dependent/Patron/Borrower_PrevCheckout.t
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit e66ccaa3a7743378f906612562889a9476bf6802
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Aug 9 10:17:41 2019 +0000
Bug 16219: (QA follow-up) Tiny regex change
The parameter <<>> does not work. There should be text inside.
The construction .*? does not look good completely.
Replacing it by the stricter [^>]+ So, no greater than's and at least one.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 52587b4319d5d22436733f296021648d846f6359
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jul 19 19:42:37 2019 +0000
Bug 16219: (follow-up) Nicer message if params missing and note that they are not combined
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 72197a9574d8b27651a390b9f177a537e1bf994c
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Sep 5 11:15:01 2018 +0000
Bug 16219: Add 'params' parameter to runreport.pl
To test:
1 - Apply patch
2 - Write a report that takes no variables
3 - Run this using runreport.pl
perl misc/cronjobs/runreport.pl 1
4 - Confirm results as expected
5 - Write a report that takes one or more variables
6 - Run using runreport.pl, but pass no params
7 - You should get a SQL error
8 - Now run passing the correct number of params
perl misc/cronjobs/runreport.pl --param first --param=2nd 2
9 - Verify results as expected
10 - call runreport with no parameters
perl misc/cronjobs/runreport.pl
11 - Verify documentation is correct and helpful
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 06e28c3ac5b708ce01ea1265fa993c1f85e98645
Author: Emmi <emmi.takkinen at outlook.com>
Date: Wed Jul 10 09:25:43 2019 +0300
Bug 22272: Calendar: When entering date ranges grey out dates in the past from the start date
In "Calendar" tool it's possible to pick dates before start
date as end date.
This patch sets end date calendars "minDate" as picked start day
to grey out past dates. Also reindents datepicker code for
better readability.
Test plan:
- Apply this patch
- Set start date from first calendar
- Set end date from second calendar
=> Dates before start date are greyed out
Signed-off-by: Nadine Pierre <nadine.pierre at inLibro.com>
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 5c2daf28a5b027187f0e4c29111ed03b1525a33e
Author: Alex Buckley <alexbuckley at catalyst.net.nz>
Date: Tue Jul 9 13:51:31 2019 +0000
Bug 13552: (follow-up) Add debar option to batch patron modification
As per test feedback I've changed wording from debarrment to restriction
Added insertion into the borrower_debarments table and removal from
borrower_debarments table (and borrowers.debarred and
borrowers.debarredcomment) when either 'Restriction
expiration' or 'Restriction comment' are ticket to be disabled/deleted.
Test plan (please follow this instead of following test plan in the
first patch):
1. Go to Tools > Batch patron modification
2. Input the cardnumbers of several (undebarred/unrestricted) patrons
and submit
3. Notice there is no input for setting Restriction expiration date or
Restriction comment
Also notice in the list of matching borrowers at the top of the page
there is no display of the 'Restriction expiration' or 'Restriction
comment' values for the patron
4. Apply patch
5. Restart memcached and plack
6. Refresh the page notice 'Restriction expiration' (a date picker
input) and 'Restriction comment'are now input options
Also notice in the table at the top of the page 'Restriction
expiration' and 'Restriction comment' are shown on the far right of the table (you may need
to scroll to see this)
7. Pick a date in the 'Restriction expired' datepicker and write in text into
the 'Restriction comment' field and submit
8. Notice in the next loaded page the selected patrons have the
'Restriction expiration' and 'Restriction comment' values you entered
9. Query the borrower_debarments database table and check that the new
debarments are added to this table
10. Go back to the Batch patron modification page and re-input the same
cardnumbers
11. Write text into the 'Restriction comment' field and don't pick a
'Restriction expiration' value and submit
12. Notice in the next loaded page the selected patrons have the
'Restriction expiration' value of 9999-12-31 and 'Restriction comment'
value you just entered
13. Query the borrowers table and notice the borrowers.debarred value
for the modified patrons is '9999-12-31' and the
borrower.debarredcomment is what you inputted in step 11
14. Query the borrower_debarments table and notice the expiration value
is NULL and the comment value is set to what you entered in step 11
Also note the addition of the new debarment has not removed the existing
debarment on the patrons
15. Click on the cardnumber link of one of the patrons and notice the red
text on their patron account page informing you they are restricted
until the date you set
16. In the Koha home directory enter Koha shell:
sudo koha-shell <instancename>
17. Run: prove xt
18. All tests should pass
19. Repeat step 10 and tick the checkbox beside the 'Restriction
expiration' field and submit
20. In the next loaded screen notice the 'Restricted expiration'and
'Restricted comment' are empty
Check the borrower_debarments table and notice all restrictions for the
patron are removed.
Check the borrowers table and notice the debarred and debarredcomment
fields are empty for the patrons
21. Repeat steps 10 and 11 to make a new restriction
22. Repeat step 19 and this time check the 'Restriction comment' field
and submit and observe that also clears the restriction in the next
loaded page, in the borrower_debarments and borrowers table
23. Sign off
Sponsored-By: Brimbank Library, Australia
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit c6775396c588d507b2a9ebb43b22eb9fbb92fec9
Author: Alex Buckley <alexbuckley at catalyst.net.nz>
Date: Tue Jul 9 06:02:01 2019 +0000
Bug 13552: Add debar option to batch patron modification
Test plan:
1. Go to Tools > Batch patron modification
2. Input the cardnumbers of several (undebarred/unrestricted) patrons and submit
3. Notice there is no input for setting a debarred until (restriction
expiration) date or debar comment
Also notice in the list of matching borrowers at the top of the page
there is no display of the debarred or debarredcomment values for the
patron
4. Apply patch
5. Restart memcached and plack
6. Refresh the page notice 'Debarred till' (a date picker input) and
'Debarred comment' are now input options
Also notice in the table at the top of the page 'Debarred till' and
'Debarred comment' are shown on the far right of the table (you may need
to scroll to see this)
7. Pick a date in the 'Debarred till' datepicker and write in text into
the 'Debarred comment' field and submit
8. Notice in the next loaded page the selected patrons have the
'Debarred till' and 'Debarred comment' values you entered
9. Click on the cardnumber link of one of the patrons and notice the red
text on their patron account page informing you they are restricted
until the date you set
10. In the Koha home directory enter Koha shell:
sudo koha-shell <instancename>
11. Run: prove xt
12. Confirm all tests pass
13. Sign off
Sponsored-By: Brimbank Library, Australia
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 023cfa76bac099d5b7a14c05577e150b1eff0a32
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Mar 25 08:20:51 2019 -0400
Bug 20954: (QA follow-up) Rename syspref-overrides to syspref_overrides to maintain existing convention
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 9cbaec2a94aaef2d946a6d1dea57af5f9ff4e22c
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Jun 15 13:03:43 2018 +0000
Bug 20954: Add ability to set syspref overrides in SIP as we can in apache
We should be able to set system preference overrides for SIP in a
similar manner that we do in Apache. It would be great if we could
specify those overrides on both a config level, and login level basis.
Test Plan:
1) Apply this patch
2) Start your SIP server
3) Enable the syspref AllFinesNeedOverride
4) Find or create a patron with a small fine ( less than noissuescharge )
5) Attempt to check out an item to the patron, it should fail
6) Add the global syspref override from the bottom of the example SIP config file
7) Restart your SIP server
8) Attempt to check out an item to the patron again, this time it should work
9) Now, add the login level syspref override section as it appears in
the eaxmple SIP config file. Make sure to add it to the login you are using
10) Attempt to check out another item to the patron, this time is should
again fail
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit c13de8ca6566c7ad7f6702e6372192765176becd
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Jul 31 11:43:11 2019 +0000
Bug 23390: (follow-up) Quote aliases
Signed-off-by: George Williams <george at nekls.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 187b3c553918ae5d737c445762783e9b7fa5580f
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Jul 30 15:40:54 2019 +0000
Bug 23390: (QA follow-up) Don't redeclare variable
Signed-off-by: George Williams <george at nekls.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 90d85eaeb9cd64b7d46078daef727e38d18cf5e1
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Sat Jul 27 13:07:18 2019 +0000
Bug 23390: Introduce placeholder syntax for report column names
This patch adds the ability to rename columns in MySQL reports using a syntax:
[[column|alias]]
To test:
1 - Write a report like:
SELECT cardnumber FROM borrowers WHERE cardnumber LIKE '%9'
2 - Run report
3 - Note you can batch modify the patrons
4 - Update report:
SELECT cardnumber AS library_barcode FROM borrowers WHERE cardnumber LIKE '%9'
5 - Run report
6 - Note batch options are no longer present
7 - Apply patch
8 - Run report, no change
9 - Update report like:
SELECT [[cardnumber|library_barcode]] FROM borrowers WHERE cardnumber LIKE '%9'
10 - Run report
11 - Batch options work!
12 - Update report like:
SELECT cardnumber FROM borrowers WHERE cardnumber LIKE '%9'
13 - Verify batch options still work
14 - Set report 'public'
15 - Verify report can be run via JSON URLs:
http://kohadev.mydnsname.org:8080/cgi-bin/koha/svc/report?id=1
http://kohadev.mydnsname.org:8081/cgi-bin/koha/svc/report?id=1
Signed-off-by: George Williams <george at nekls.org>
Signed-off-by: George Williams <george at nekls.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 0a66d33d8c5d778e3a0961cb5953e2432d9ccb65
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Jul 29 12:57:21 2019 +0000
Bug 23385: (follow-up) Update link
This follow-up adds a dummy href attribute to the link for showing and
hiding the default values form so that it behaves more like a link.
I removed "click to" from the link text and added Font Awesome icons
common to "show/hide" links.
Signed-off-by: George Williams <george at nekls.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 9258d385baa94a00f671dea6315c7738a8f38026
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jul 26 14:48:51 2019 +0000
Bug 23385: Hide 'Default values' fields by default
To test:
1 - Go to Tools->Import patrons
2 - Choose a file
3 - Scroll a long way to submit
4 - Apply patch
5 - Choose a file
6 - Can submit easily
7 - Click to expand and enter default fields
8 - Confirm can still submit and that values entered are used
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Signed-off-by: George Williams <george at nekls.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 9f11eef934dcda7cd76176b1a6431d77840b755e
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Aug 13 11:42:46 2019 +0100
Bug 23438: Compiled CSS
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 2fade168c81bc05d24164780cbddc100302dd71f
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Wed Aug 7 15:33:52 2019 +0200
Bug 23438: Use Font Awesome icons in intranet search results browser
In intranet after a search you see a results browser top left of biblio record details.
Actually this uses text for links next and previous with a character for the arrows.
I propose to use Font Awesome icons arrows.
In fact the translated text is often too large for those buttons.
For example "Previous" is "Préédant" in french and it causes the next and previous buttons to display on two lines.
Using icons is more compact and easy to use.
This patch also adds the list icon to back to results link and changes for a minimal text "Results".
1) Go to intranet
2) Perform a search with a few results
3) Click on first record
4) Check browser displays well
5) Click on next icon, check you go to next search result
6) Click on revious icon, check you go to previous search result
7) Click on "Results", you come back to search results
8) Clik on "Last" and click on last record
9) Check browser displays well
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
C4/SIP/Sip/MsgType.pm | 13 +++++
Koha/Biblio.pm | 19 ++++++
Koha/Patron.pm | 10 ++--
etc/SIPconfig.xml | 12 ++++
koha-tmpl/intranet-tmpl/js/browser.js | 10 ++--
.../intranet-tmpl/prog/css/src/staff-global.scss | 1 -
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +-
.../prog/en/includes/browser-strings.inc | 2 +-
.../en/modules/reports/guided_reports_start.tt | 18 +++---
.../prog/en/modules/tools/holidays.tt | 61 ++++++++++----------
.../prog/en/modules/tools/import_borrowers.tt | 13 ++++-
.../prog/en/modules/tools/modborrowers.tt | 8 +++
misc/cronjobs/runreport.pl | 16 ++++-
opac/svc/report | 1 +
reports/guided_reports.pl | 19 +++++-
svc/report | 1 +
t/db_dependent/Koha/Biblio.t | 26 ++++++++-
t/db_dependent/Patron/Borrower_PrevCheckout.t | 39 ++++++++++++-
tools/modborrowers.pl | 38 +++++++++++-
19 files changed, 246 insertions(+), 63 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list