[koha-commits] main Koha release repository branch master updated. v18.05.00-1210-g3a150b5
Git repo owner
gitmaster at git.koha-community.org
Mon Oct 29 02:29:58 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 3a150b5d7519c2969de6d966193af242e1e787e0 (commit)
via 5367bfcabd395c926be1c8e215d0e8c2eb76898f (commit)
via cde4bb0d2337add26de87dcb68ca5da371283099 (commit)
via 411e78864918c909feffeadb341db37cea0a4393 (commit)
via ad56b39888f1422606b16375b903fffa19bc59ba (commit)
via b3661a5caeb634cbb6ca012998048d18d2f782b2 (commit)
via 8c45ed8601ce8ebe6c4b2c6ccc452865921a7ae9 (commit)
via bab5ff0645768a1283f28d651687bd1cc6d3dfbe (commit)
via 5a979fd0c4c34f5ccd2da744dd2847faf72aef2b (commit)
via 2ca766f39245e1c3bd9b4acc9ce01a9eeaec8a56 (commit)
via b94399131614a304b3a0282ec8a85194cc72b3cf (commit)
via 7b6107beaf06d3e3956dc69145d966a35de1a59d (commit)
via 0cffb0f7589aa52d65bda9a8a4934790a141f3a0 (commit)
via 5256f25d24b114a5186a9ed612e845e114bebb7e (commit)
via e64650216f568e7d7ad26e25ae59493202d871a3 (commit)
via 716301d6f5bb149e963c5547d69d4019c20953db (commit)
via 4858c4f736d366701fa6a3f1def2727dd85c70ce (commit)
via 6fba062d291e065b4a6d7ffebdf82db9d6935971 (commit)
via 344dba2fb84a743603c1c51294be4e378e6e5dc7 (commit)
via de40a681625b544efdb697ab25b960bff08cb200 (commit)
via c579b9c8f4dbffd0a521198d530d7012eb5d2402 (commit)
via edf99afa63e2c57fcda3f39ef36a651ac109d643 (commit)
via e7c049fea753232a51d78e07a9f15354cd71a469 (commit)
from 5c5ecedb3f1cfed8d97ba837bfa98427d4a6ec5e (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 3a150b5d7519c2969de6d966193af242e1e787e0
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sun Oct 28 05:43:30 2018 +0000
Bug 20720: (QA follow-up) Some minor corrections
Made some corrections to countries, spelling and
changed OPUS entry.
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 5367bfcabd395c926be1c8e215d0e8c2eb76898f
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Sat Oct 20 13:49:51 2018 +0100
Bug 20720: Found some more sponsors to add to 'about'
git log|grep -i "sponsored-by"|sort -n | uniq
git log|grep -i "sponsored by"|sort -n | uniq
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit cde4bb0d2337add26de87dcb68ca5da371283099
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Oct 19 17:17:41 2018 +0100
Bug 20720: Using git Sponsored-by lines to update 'about'
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 411e78864918c909feffeadb341db37cea0a4393
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Aug 17 12:22:50 2018 +0000
Bug 21242: If not searching for patron, move to log viewer
To test:
1 - Bring up a patron
2 - Click 'Modification log'
3 - Note you get borrower info
4 - Move the object field into info field
5 - Submit
6 - You are now on the 'Log viewer' page with admin options, not
borrower circ options
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ad56b39888f1422606b16375b903fffa19bc59ba
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Oct 23 10:15:11 2018 -0300
Bug 21634: Keep "circulation" module selected when viewing patron's logs
To recreate:
- View a patron detail page
- Click "Modification log"
- Notice that the url has "modules=MEMBERS&modules=circulation", but
the "Circulation" option is not selected in the "Modules" dropdown list.
This is because of uppercase vs lowercase.
The bug:
- Right after you click "Modification log" you will see all the
"members" and "circulation" logs
- Submit the form without changing any input/select from the form
=> Now you only see the "members" logs.
Test plan:
- Apply the patch
- Click "Modification log"
- Notice that the url now contains "modules=MEMBERS&modules=CIRCULATION"
- Submit the form without changing any input/select from the form
=> Now you have the "members" and "circulation" modules selected.
Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b3661a5caeb634cbb6ca012998048d18d2f782b2
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Oct 19 11:36:16 2018 -0300
Bug 21613: (QA follow-up) Resolve warning on $ENV{_} - avoid autovivification
See C4::Circulation::SendCirculationAlert
3355 my $do_not_lock = ( exists $ENV{_} && $ENV{_} =~ m|prove| ) || $ENV{KOHA_NO_TABLE_LOCKS};
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 8c45ed8601ce8ebe6c4b2c6ccc452865921a7ae9
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Oct 19 10:15:56 2018 +0200
Bug 21613: (QA follow-up) Resolve warning on $ENV{_}
Some shells may not pass the program name in underscore, and cron also
does not like it here:
Use of uninitialized value $ENV{"_"} in pattern match (m//) at Koha/Database.pm line 79.
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: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit bab5ff0645768a1283f28d651687bd1cc6d3dfbe
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Oct 18 20:06:07 2018 -0300
Bug 21613: Turn strict SQL modes on for tests
This patch will turn the strict SQL modes on When tests are ran with prove.
Test plan:
- Apply the first patch
- prove t/db_dependent/Koha/Database.t
=> Will pass if you have <strict_sql_modes>1</strict_sql_modes> in your
koha-conf.xml
=> Will fail otherwise
- Apply the second patch
- prove t/db_dependent/Koha/Database.t
=> Will pass whatever the value of strict_sql_modes in your
koha-conf.xml
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 5a979fd0c4c34f5ccd2da744dd2847faf72aef2b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Oct 18 20:06:03 2018 -0300
Bug 21613: Add a test
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 2ca766f39245e1c3bd9b4acc9ce01a9eeaec8a56
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Fri Sep 14 16:06:49 2018 -0700
Bug 21349: Instructors with special characters in cardnumber cannot be removed from course reserves
The cardnumber can contain strange non-javascript-friendly
characters. This patch converts all the internal references
to borrowernumber, but displays the cardnumber when showing
list of matching users.
TEST PLAN
---------
1) Make sure Course Reserves is being used. Check system preferences.
2) Make sure there is a Course entered.
3) Make sure there is a patron with an cardnumber which breaks
the existing javascript (eg. Ka-boom:Ka-boom!KABOOM@#$!)
4) Go into the course list.
5) Click the course name link
6) In the "Instructor Search" box enter the patron name.
7) Select the patron which has the ugly cardnumber.
8) Click Save
-- The course listing should have the new teacher listed.
9) Click the course name link again.
10) Click 'Remove' beside the instructor's name.
-- nothing happens, and inspecting the error console gives
you the ugly error described in comment #0
11) apply this patch
12) restart_all
13) sudo service apache2 restart
14) refresh the page.
15) click 'Remove' beside the instructor's name.
-- name is removed.
16) Click Save
-- the course listing no longer lists the new teacher.
17) Actually confirm that adding and removing others normally
works as expected.
18) run koha qa test tools.
Signed-off-by: Charles Farmer <charles.farmer at inLibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b94399131614a304b3a0282ec8a85194cc72b3cf
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Oct 25 15:24:29 2018 +0000
Bug 21186: (follow-up) Incorrect Bootstrap modal event name in multiple templates
This patch addresses a few more instances of this problem which I didn't
catch in my first pass.
To test, apply the patch and clear your browser cache if necessary.
- Go to Circulation -> Check in and check in an item which has a hold.
- When the 'Hold found' modal appears the checkin barcode field
behind it should be disabled.
- When the modal is dismissed the checkin field should be enabled
again and focus should be on that field.
- Go to Administration -> Library groups.
- Click the "Add group" button. The cursor focus should be on the
title field.
- Go to Tools -> MARC modification templates.
- Click the "New template" button. The cursor focus should be on the
name field.
Signed-off-by: Cori Lynn Arnold <carnold at dgiinc.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7b6107beaf06d3e3956dc69145d966a35de1a59d
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Aug 8 19:03:38 2018 +0000
Bug 21186: Incorrect Bootstrap modal event name in multiple templates
Modals in the staff client which load data via AJAX require an "on
close" action in order to clear the modal of the loaded data. The
problem presents itself the second time the modal is opened: The
"loading" message doesn't appear, and the data from the previous link
is shown until the new data loads.
To test, apply the patch and test the following pages. In each case,
click multiple instances of the modal trigger link/button to confirm
that the "loading" message always appears between re-displays of the
modal.
- Acquisitions -> Vendor -> Add to basket -> From a staged file -> Add orders
- Test the "MARC" and "Card" links
- Acquisitions -> EDIFACT messages
- Test the "View message" button
- Acquisitions -> Vendor -> Add to basket -> From an existing record
- Test "View MARC" link
- Acquisitions -> Vendor -> Invoices -> Invoice -> Receipt page
- Test the "Order," "MARC," and "Card" links.
- Catalog -> Bibliographic record details
- Test the MARC Preview link.
- Cataloging -> Cataloging search results
- Test the Actions -> MARC preview and Actions -> Card preview menu
items
- Cataloging -> Cataloging search results -> Merge
- Test the "View MARC" linkscataloguing/merge.tt
- Tools -> Patron lists -> Actions -> Print patron cards
- Tools -> Batch record modification -> Results -> Show MARC
- Tools -> Staged MARC record management -> View batch
- Test MARC preview shown when you click a staged title
Signed-off-by: Cori Lynn Arnold <carnold at dgiinc.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 0cffb0f7589aa52d65bda9a8a4934790a141f3a0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Oct 19 12:06:43 2018 -0300
Bug 21621: Remove incorrect GROUP BY from tools/letter.pl
Fix:
'koha_kohadev.letter.name' isn't in GROUP BY
DBD::mysql::db selectall_arrayref failed: 'koha_kohadev.letter.name' isn't in GROUP BY [for Statement "SELECT branchcode, module, code, name, branchname
FROM letter
LEFT OUTER JOIN branches USING (branchcode)
GROUP BY branchcode,module,code ORDER BY module, code, branchcode"] at /home/vagrant/kohaclone/tools/letter.pl line 383.
Test plan:
- Copy some default notice templates for specific libraries
- List the different notice templates
- Confirm that notices appear only one, with "all libraries" you will see all
Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 5256f25d24b114a5186a9ed612e845e114bebb7e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sun Oct 28 08:59:51 2018 -0300
Bug 21703: Fix filter on dataurl variable to allow placing holds in staff again
We must not encode & again and use the url filter, instead of uri.
To test:
- Search for a record in staff
- Go to holds
- Search for patrons, multiple should be displayed
- Pick a patron by clicking on the name
- Verify an error is shown and the URL is incorrect
- Apply patch
- Repeat test above, placing a hold should now work.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit e64650216f568e7d7ad26e25ae59493202d871a3
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Oct 25 11:37:42 2018 +0200
Bug 21311: (follow-up) Adjust wording of failed login message
Based on the feedback of Jonathan, Katrin, Mark and Martin (thx), adding
the general remark that if lockout is enabled, an account may be locked
out after x attempts. This does not say that the account on hand is
locked or not.
Adding a <p> tag between 'Log in'-button and 'Forgot your password' for
presentation.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 716301d6f5bb149e963c5547d69d4019c20953db
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Oct 10 16:04:38 2018 +0200
Bug 21311: Remove locked message from opac-auth.tt
We should not expose more information than needed when someone tries
to login with invalid credentials. Saying that an account is locked
reveals that the account exists (or perhaps an email address).
Trivial fix. Keeping the var too_many_login_attempts for staff.
Note: We do not remove this distinction for the staff client here (in the
assumption that a library may well have additional security measures in
place for staff client). But it could be done too (on another report).
Test plan:
Enable lockout feature.
Enter invalid credentials until account locks out (on OPAC !!)
Note that message does no longer change to 'Account is locked'.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 4858c4f736d366701fa6a3f1def2727dd85c70ce
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Thu Oct 25 14:17:59 2018 +0100
Bug 21641: (follow-up) Address wrong call method
This patch substitutes C4::Accounts->getnextacctno for
C4::Accounts::getnextacctno since getnextacctno is only expecting to be
passed a borrowernumber
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 6fba062d291e065b4a6d7ffebdf82db9d6935971
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Thu Oct 25 13:23:31 2018 +0100
Bug 21641: (follow-up) Address additional call
This patch makes the same change as the main patch, just for an
additional occurance of getnextacctno
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 344dba2fb84a743603c1c51294be4e378e6e5dc7
Author: Alex Buckley <alexbuckley at catalyst.net.nz>
Date: Wed Oct 24 03:37:57 2018 +0000
Bug 21641: Added C4::Accounts to getnextacctno() call
Test plan:
1. Fetch and checkout the master branch
2. Checkout an item with a rental charge associated with it to a user
and notice an error is thrown
3. Apply patch
4. Restart memcached and plack
5. Repeat steps 1 and 2 and notice the checkout happens successfully
Sponsored-By: Catalyst IT
Signed-off-by: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit de40a681625b544efdb697ab25b960bff08cb200
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Oct 25 11:29:28 2018 +0000
Bug 21611: Fix priority dropdown for holds
To Test:
1 - Find a record
2 - Place several holds some with differing pickup locations
3 - Check in one hold to confirm as waiting
4 - Check another in to set a hold in transit
5 - View the holds queue for the record:
/cgi-bin/koha/reserve/request.pl?biblionumber=##
6 - Confirm found holds are incorrect
7 - Apply patch
8 - Reload
9 - Confirm holds look correct
10 - Alter the values of HoldsSplitQueue and HoldsSplitQueueNumbering
11 - Confirm things still look right
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit c579b9c8f4dbffd0a521198d530d7012eb5d2402
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sun Oct 28 16:10:52 2018 +0000
Bug 21704: (QA follow-up) Fix evil tabs
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit edf99afa63e2c57fcda3f39ef36a651ac109d643
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Sun Oct 28 09:56:17 2018 -0300
Bug 21704: (follow-up) Remove unused 'frameworkcode' template param
This patch removes the 'frameworkcode' template parameter. Now the
'framework' object is passed, and everytime the frameworkcode is needed
on the template, framework.frameworkcode is called.
To test:
- Apply this patch
- Run:
$ grep ' frameworkcode ' koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
=> SUCCESS: There's no use of 'frameworkcode' in the template
- Sign off :-D
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit e7c049fea753232a51d78e07a9f15354cd71a469
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Sun Oct 28 09:36:32 2018 -0300
Bug 21704: Edit framework subfield link is broken (TT filter)
This patch removes URL building from the controller
(admin/marctagstructure.pl) and does it on the templates, using the
right 'uri' filter for the query parameters.
It also removes:
- No longer used attributes that are passed to the template
- Duplicated code in the templates
To test:
- Go to Home > Administration > MARC bibliographic framework
- On any of the listed frameworks, pick the 'MARC structure' action in
the dropdown
- On any subfield, hover on the actions dropdown
=> FAIL: The URLs are wrongly formed
- Click on the links
=> FAIL: You get errors because of the bad URL
- Apply this patch
- Reload the 'MARC structure' page
- On any subfield, hover on the actions dropdown
=> SUCCESS: LInks look correct
- Click on any of them
=> SUCCESS: They work!
- Use the 'Display only used tags/subfields' checkbox
=> SUCCESS: No behaviour change!
- Sign off :-D
Sponsored-by: Theke Solutions
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 4 +-
Koha/Database.pm | 6 +-
admin/marctagstructure.pl | 28 +++------
course_reserves/mod_course.pl | 2 +-
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 2 +-
.../en/includes/circ-patron-search-results.inc | 4 +-
.../intranet-tmpl/prog/en/includes/holds_table.inc | 7 ++-
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 61 +++++++++++++++++++-
.../prog/en/modules/acqui/addorderiso2709.tt | 2 +-
.../prog/en/modules/acqui/edifactmsgs.tt | 2 +-
.../prog/en/modules/acqui/neworderbiblio.tt | 2 +-
.../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 2 +-
.../prog/en/modules/admin/library_groups.tt | 4 +-
.../prog/en/modules/admin/marctagstructure.tt | 42 +++-----------
.../prog/en/modules/catalogue/detail.tt | 2 +-
.../prog/en/modules/cataloguing/addbooks.tt | 2 +-
.../prog/en/modules/cataloguing/merge.tt | 2 +-
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 4 +-
.../prog/en/modules/course_reserves/course.tt | 18 +++---
.../prog/en/modules/patron_lists/lists.tt | 2 +-
.../en/modules/tools/batch_record_modification.tt | 2 +-
.../prog/en/modules/tools/manage-marc-import.tt | 2 +-
.../prog/js/marc_modification_templates.js | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-auth.tt | 16 ++---
.../db_dependent/Koha/Database.t | 15 ++---
tools/letter.pl | 1 -
tools/viewlog.pl | 6 +-
27 files changed, 125 insertions(+), 117 deletions(-)
copy cataloguing/plugin_launcher.pl => t/db_dependent/Koha/Database.t (73%)
mode change 100755 => 100644
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list