[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.05-71-g827da7b
Git repo owner
gitmaster at git.koha-community.org
Thu Nov 8 17:00:33 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, 18.05.x has been updated
via 827da7b676d8cbe42f696613541d1217d3f9370a (commit)
via 5f7a2c92138ee44cf24d14cb52602bd490b89f2d (commit)
via 5d6eb1f67ba10edc83bd4b098ac5238dbfefe139 (commit)
via eea7b7493506bc7d6095f41b4f02f1be357432d5 (commit)
via 14e9eb67b9e86b025eeddc9426c490280a4c022f (commit)
via 55d687f3a7002439c6d27fb35af83333b8dfcdc4 (commit)
via ff2de8e181e864cd121e39e314fe6be4dbe8eb0b (commit)
via e79fac32c8ca7ef01b516feea461a07c7e8e3570 (commit)
via 5c62543310c94b179dd3c8c93f4f79a414be5980 (commit)
via 932f39906c7e82d1813a2602290e986f139eb1c5 (commit)
via faf4548438505f81dfb80b18018b3d460edd1ad9 (commit)
from e279cd0d3ac42ce054b3390003b9f0e8334f127d (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 827da7b676d8cbe42f696613541d1217d3f9370a
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>
(cherry picked from commit 2ca766f39245e1c3bd9b4acc9ce01a9eeaec8a56)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 5f7a2c92138ee44cf24d14cb52602bd490b89f2d
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>
(cherry picked from commit b94399131614a304b3a0282ec8a85194cc72b3cf)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 5d6eb1f67ba10edc83bd4b098ac5238dbfefe139
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>
(cherry picked from commit 7b6107beaf06d3e3956dc69145d966a35de1a59d)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit eea7b7493506bc7d6095f41b4f02f1be357432d5
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>
(cherry picked from commit 0cffb0f7589aa52d65bda9a8a4934790a141f3a0)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 14e9eb67b9e86b025eeddc9426c490280a4c022f
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>
(cherry picked from commit e64650216f568e7d7ad26e25ae59493202d871a3)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 55d687f3a7002439c6d27fb35af83333b8dfcdc4
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>
(cherry picked from commit 716301d6f5bb149e963c5547d69d4019c20953db)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit ff2de8e181e864cd121e39e314fe6be4dbe8eb0b
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>
(cherry picked from commit 4858c4f736d366701fa6a3f1def2727dd85c70ce)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit e79fac32c8ca7ef01b516feea461a07c7e8e3570
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>
(cherry picked from commit 6fba062d291e065b4a6d7ffebdf82db9d6935971)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 5c62543310c94b179dd3c8c93f4f79a414be5980
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>
(cherry picked from commit 344dba2fb84a743603c1c51294be4e378e6e5dc7)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 932f39906c7e82d1813a2602290e986f139eb1c5
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Fri Oct 26 09:28:01 2018 +0000
Bug 21680: Remove dead code - C4::Accounts::fixaccounts
Test plan:
git grep fixacccounts
-- without patch there are 3 occurences
-- with patch - no occurence of fixaccounts
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 89bad1fa460dc75bdaeb40e82ee56639e35fe0c9)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit faf4548438505f81dfb80b18018b3d460edd1ad9
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Oct 24 19:50:02 2018 -0300
Bug 21654: Remove refund_lost_item_fee_rules.sql from the installer process
This is a follow-up patch for bug 14048 comment 97
Test plan:
git grep refund_lost_item_fee_rules.sql
should not return any results
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 51ce2ebfe12e344beec4d73109e885c5c303347c)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Accounts.pm | 31 --------------------
C4/Circulation.pm | 4 +--
C4/Installer.pm | 1 -
course_reserves/mod_course.pl | 2 +-
.../prog/en/modules/acqui/addorderiso2709.tt | 2 +-
.../prog/en/modules/acqui/edifactmsgs.tt | 4 +--
.../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/catalogue/detail.tt | 4 +--
.../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 | 4 +--
.../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 +++-------
tools/letter.pl | 1 -
20 files changed, 34 insertions(+), 75 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list