[koha-commits] main Koha release repository branch 18.11.x updated. v18.11.05-89-g7fef314
Git repo owner
gitmaster at git.koha-community.org
Thu May 30 23:02:45 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, 18.11.x has been updated
via 7fef31478a825d678c6d8189f6038c764e612b42 (commit)
via 6a219c80805c6bff21960673781d0fa670fd331a (commit)
via 0bc11fc432eb4902259283786ad93dfca4db5c32 (commit)
via 640be0ed6e4814e2c5ee6e8da777deed02b5ebce (commit)
via 967f92bdd28edcfd3224783cb652178ec7c09ad2 (commit)
via b1c6a7436818029cc664e029d2f5dbde20cd5ba2 (commit)
via b1f66ce620d3721761544bf1cd4ee8fca67bab10 (commit)
via 1547a4472e27729ae0bfd3a842621d525b3e26f1 (commit)
via 6e30506b3f50ab783f8d70821c933617ae11544f (commit)
via 6787984206cd94ec9d70c1c6b6d478d0a8ad6c05 (commit)
via 19aa13773a2156c5db831f300fe580409e8724c8 (commit)
via 2e705d368034e2a06ccb6b31ccc249a60e341f42 (commit)
via 776151fdf31b292574e4c0bb0c4f185f59c8a218 (commit)
via 9c411575078b529e57e98c808ab7eb2facef1e65 (commit)
from e83e2a47a3fc490634be78750e5464ffef894667 (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 7fef31478a825d678c6d8189f6038c764e612b42
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Tue May 14 08:22:43 2019 +0200
Bug 22901: On items search fix search field change listening
In items search, when there is a custom field with authorised values :
when changing the conditional select AND/OR then the authorised values select disappears.
This behaviour is like when the search field is changed.
The bug is that JavaScript code meaning search field change listens on all selects instead of only search field select.
Test plan :
1) Define a custom items search field with authorised values
2) Go to items search
3) Click on 'New field'
4) On second line, select custom field
5) The authorised values select appears
6) Select 'AND' in conditional select
7) Without patch the authorised values select disappears, with patch nothing changes
8) On second line, select a non-custom field
9) The authorised values select is replaced by a text field
10) On second line, select custom field
11) The authorised values select appears
Signed-off-by: Maryse Simard <maryse.simard 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 e65b708f5385aa9df352cebe3c688a152fe1e176)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 6a219c80805c6bff21960673781d0fa670fd331a
Author: Hayley Mapley <hayleymapley at catalyst.net.nz>
Date: Fri May 24 13:52:58 2019 -0500
Bug 20537: Added checks to remove warning from overdue_notices.pl
When executing overdue_notices.pl on borrowers that lack a surname, we
see this error:
Use of uninitialized value in concatenation (.) or string at
/usr/share/koha/bin/cronjobs/overdue_notices.pl line 575.
This patch fixes this issue by setting the $borr variable
based on the information that has been defined.
To test:
1) Create a borrower and set its surname to null
2) Checkout an item to the borrower and set it to be overdue
3) Navigate to kohaclone/misc/cronjobs and enter a koha-shell
4) Run the script: ./overdue_notices.pl
5) Observe the error appears
6) Apply the patch
7) Repeat steps 3-4
8) Observe the error is gone
9) Sign off!
Sponsored-by: Catalyst IT
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 7d42e29c8b8cd913b052d10525c4d0b2cb36fc0d)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 0bc11fc432eb4902259283786ad93dfca4db5c32
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu May 16 13:02:29 2019 -0500
Bug 22907: Add missing use statement
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
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 02305630824e46c9c7846aa6f163265970463d1e)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 640be0ed6e4814e2c5ee6e8da777deed02b5ebce
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue May 14 12:27:25 2019 -0500
Bug 22907: Remove previous code handling the same thing
See:
commit a71b96295fb07084e4f87ac1a471e89355f3c5a4
Bug 12627: Fix default values
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
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 8fed07826ee9fd69f3b92bbb6decb864e4c7dfd2)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 967f92bdd28edcfd3224783cb652178ec7c09ad2
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue May 14 12:06:24 2019 -0500
Bug 22907: Fix new suggestion with strict sql modes
With sql_strict_modes turned on, if you try to create a new suggestion
you will get:
Incorrect integer value: '' for column '$INT_COLUMN' at row 1
Test plan:
Turn on strict_sql_modes, create a new suggestion, then edit it.
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
JD: Edit after SO, remove unecessary changes (not related to this bug)
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 2329d2ea8393e133bf689eb2d311fb0bcc99640f)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit b1c6a7436818029cc664e029d2f5dbde20cd5ba2
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue May 14 12:05:53 2019 -0500
Bug 22907: Add tests
Do not use copyrightdate as it is weird to have it int
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
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 936cf409992d6393473f564a25f70ea8b390e74b)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit b1f66ce620d3721761544bf1cd4ee8fca67bab10
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri May 17 13:19:33 2019 +0000
Bug 22932: GetLatestSerials should not return formatted date
This patch updates GetLatestSerials in Serials.pm to remove date
formatting. Formatting of dates should be done in the template using
$KohaDates.
To test, apply the patch and locate a bibliographic record in the staff
client which has a subscription with issues.
- On the bibliographic detail page for that record, view the
"Subscriptions" tab. Dates in the table of recent issues should be
formatted correctly.
- View the details for the subscription in the Serials module. Create
or edit a routing list for that serial. In the "Issue" dropdown the
issue dates should be formatted correctly.
- View the bibliographic detail page for the record in the OPAC. Open
the "Subscriptions" tab. In the table of recent issues publication
date and received date should be formatted correctly. The table
should sort correctly on these dates.
Note: Although opac-ISBDdetail.pl calls GetLatestSerials, as far as I
can tell there is no serial-related output to update. The code appears
to be unused.
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 1cdf657c057a7a565016df28a17151a2f4fce134)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 1547a4472e27729ae0bfd3a842621d525b3e26f1
Author: Lucas Gass <lucas at bywatersolutions.com>
Date: Mon May 13 18:05:38 2019 +0000
Bug 22914: Add holds column to batch item delete to fix show/hide columns behaviour
The changes on 19490 caused a bug, where the show/hide column feature hides the
wrong column on the items table. The two templates share a js file, and
the data passed is the same.
Adding the column to the template brings things back into alignment,
the data is already there, we just show it.
TEST PLAN:
1. Go to Tools > Batch item deletion and enter at least one barcode.
2. Try to hide a column that is showing
3. Notice it hides the wrong column
4. apply patch
5. repeat steps 1 and 2.
6. Notice the correct column is being hidden
7. Verify the new column for number of holds on the item works correctly
for item and record level holds
Signed-off-by: Lisette Scheer <lisetteslatah at gmail.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 bb06060c4c3e0f4393f24096400ee4c8312a44ec)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 6e30506b3f50ab783f8d70821c933617ae11544f
Author: Liz Rea <wizzyrea at gmail.com>
Date: Fri May 24 12:56:40 2019 -0500
Bug 21450: (QA follow-up) remove a couple of unused variables to make QA script happy
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 427e4ebc6ba4d52154bc8330b8edf54d5a6b88b2)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 6787984206cd94ec9d70c1c6b6d478d0a8ad6c05
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Sep 28 14:58:20 2018 +0000
Bug 21450: Cache authorities search using term and auth_type
This is a simple fix to prevent incorrect caching of results when using
link_bibs_to_authorities
To test:
1 - Find or create a record with the same term in a subject and genre
heading
2 - Find or create authority records for the term as a subject and genre
type
3 - Run link bibs to authorities
4 - Verify both tags in the record are linked to the subject heading
5 - Aply patch
6 - Unlink the record and re-run the script (or just re-run)
7 - Each tag should be linked to correct authority
Signed-off-by: Frank Hansen <frank.hansen at ub.lu.se>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 848a0d41fffba7df1be9f2584770112f0938beb0)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 19aa13773a2156c5db831f300fe580409e8724c8
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Jan 23 21:07:41 2019 +0000
Bug 21450: Unit tests
To test:
1 - Apply just this patch
2 - prove -v t/db_dependent/Linker_Default.t
3 - It fails
4 - Apply second patch
5 - prove -v t/db_dependent/Linker_Default.t
6 - It passes
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Bug 21450: Remove copyright lines
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 366ef794969c3bc67c70ea7c9d85cb04944f4f05)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 2e705d368034e2a06ccb6b31ccc249a60e341f42
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu May 16 10:54:03 2019 +0000
Bug 22724: Check permissions in the script before displaying template
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 3034c028264f072fc1a447a11a518255282fc990)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 776151fdf31b292574e4c0bb0c4f185f59c8a218
Author: Hayley Mapley <hayleymapley at catalyst.net.nz>
Date: Wed May 8 15:39:33 2019 +1200
Bug 22724: Allow only users with correct permissions to 'Write off selected'
Due to the addition of a 'Write off selected' button in 18.11, users without
writeoff permissions could mistakenly view and action the 'Write off
selected' option for a patron in Accounting > Make a payment (Fines > Pay fines).
The attached patch corrects this error.
Test plan:
1) Make sure that a staff user has '(writeoff) Write off fines and fees'
permission disabled
2) Bring up a patron with an unpaid fee, go to Accounting -> Make a
payment
3) Note that 'Write off selected' button is displayed.
4) Select a fee, click 'Write off selected'. Note that staff member has
access to 'Write off an amount toward selected fines'
5) Apply the patch
6) Repeat steps 1-2, and note that the button is no longer displayed
7) Bonus points, as a staff user with writeoff permissions enabled check
that all four buttons (Pay amount, Pay selected, Write off all, Write
off selected) are displayed
Sponsored-by: Catalyst IT
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit d36566d6eaa9dd02528bbd1219747ccfd4e6b531)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 9c411575078b529e57e98c808ab7eb2facef1e65
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue May 14 13:43:12 2019 +0000
Bug 22904: Untranslatable strings in members-menu.js
This patch moves several English strings out of members-menu.js and into
str/members-menu.inc where they can be picked up by the translation
process. The following strings are affected:
"Are you sure you want to renew this patron's registration?"
"Are you sure you want to update this child to an Adult category? This
cannot be undone."
"Dates of birth should be entered in the format 'MM/DD/YYYY'"
"Dates of birth should be entered in the format 'YYYY-MM-DD'"
"Dates of birth should be entered in the format 'DD/MM/YYYY'"
"Dates of birth should be entered in the format 'DD.MM.YYYY'"
This patch also makes a correction to members-toolbar.inc in order to
enable the presence of the "Update child to Adult" menu item.
To test:
- Install and update a language.
- Check the po-file for that language. You should find no msgid for
the strings listed above.
- Apply the patch.
- Update the language you installed.
- You should find entries for all the strings above.
- Translate those messages and update the translated templates.
- Reinstall the translation.
In the staff client:
- Select your updated translation.
- Open an expired patron's account and choose "Renew patron" from the
"More" button in the toolbar. You should be prompted for confirmation
using the translation you provided.
- To test the "Update child" confirmation you should have only one
patron category in the "Adult" category.
- Open a patron record with a child category and choose "Update
child" from the "More" menu in the toolbar. You should be prompted
for confirmation using the translation you provided.
- To test the date format messages: From the patrons home page, expand
the advanced search options in the header search form. Select "Date
of birth" under "Search fields." A correctly-translated tooltip
should appear above the search field.
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>
(cherry picked from commit f5894d41d21b3d57217397f7d8de500082e66157)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Linker/Default.pm | 20 ++---
C4/Serials.pm | 2 -
C4/Suggestions.pm | 40 ++--------
.../prog/en/includes/members-toolbar.inc | 1 +
.../prog/en/includes/str/members-menu.inc | 7 ++
.../prog/en/modules/catalogue/detail.tt | 4 +-
.../prog/en/modules/catalogue/itemsearch.tt | 2 +-
.../intranet-tmpl/prog/en/modules/members/pay.tt | 4 +-
.../prog/en/modules/serials/routing.tt | 9 ++-
.../prog/en/modules/tools/batchMod-del.tt | 43 ++++++++++-
koha-tmpl/intranet-tmpl/prog/js/members-menu.js | 14 ++--
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 4 +-
members/paycollect.pl | 17 +++--
misc/cronjobs/overdue_notices.pl | 9 ++-
t/db_dependent/Linker_Default.t | 79 ++++++++++++++++++++
t/db_dependent/Suggestions.t | 1 +
16 files changed, 180 insertions(+), 76 deletions(-)
create mode 100755 t/db_dependent/Linker_Default.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list