[koha-commits] main Koha release repository branch master updated. v19.11.00-1133-g6c3a2b4748
Git repo owner
gitmaster at git.koha-community.org
Mon Mar 16 12:29:42 CET 2020
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 6c3a2b474806d1499780966bdb35c0ddabc609d0 (commit)
via 0666b644be37899217d64c75e1a610b0a0de1724 (commit)
via ea7ec1a5d3d1c262345743bced3669c5cab39baf (commit)
via da5024e5c26a75c106504809b48325532c402510 (commit)
via 619d6362ce895ba4da543dcd809b162ed7a9b6b5 (commit)
via 3b47f87b0ff5c020300108ef4fd8e4145bfccd13 (commit)
via 0fc78cae28db6bd79549a2d78674eb51b276600f (commit)
via 22f2494914a4bbec0bb4612e813515ee7412008a (commit)
via c8468a92029af19ced6d1454ed4c5c3ae30aca34 (commit)
via 4432429c1e164adecff78869627168cf276c5d50 (commit)
via 8d505e371fa6c5848af47d48d43872fb922dc04c (commit)
via 81fd7a6936d258001aa3a0f2d0ec5d7758482f45 (commit)
via 67ef0d870963dbc62b87071c51fd1974f0f03eef (commit)
via 90480693552e305b383bf005c1fe4f2cef705228 (commit)
via 63641856dd07880bc20e285e04387c162e22050c (commit)
via c5e367c54ebaf7ddd9cd2f1df8aa1e7f4299980a (commit)
from 0c9b39a66dff00d2d76effc42824c2051484f9c5 (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 6c3a2b474806d1499780966bdb35c0ddabc609d0
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Mar 3 13:26:02 2020 +0000
Bug 24789: Remove ITS macro format
To test:
1 - Apply patches
2 - Confirm you can save, load, and run macros
3 - Confirm you have no choice of format
Signed-off-by: Andrew Fuerste-Henry <andrew 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 0666b644be37899217d64c75e1a610b0a0de1724
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Sun Mar 8 08:39:40 2020 +0000
Bug 24402: About template corrections
With the 20.05 team we introduced and expanded some roles. This patch
adds support for:
* removal of the release maintainer for development releases
* a list of documentation managers
* a list of packaging manager
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 ea7ec1a5d3d1c262345743bced3669c5cab39baf
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Fri Mar 13 08:47:53 2020 +0000
Bug 22943: Remove unused line from Auth.t
Removes an unnecessary variable declaration from Auth.t
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit da5024e5c26a75c106504809b48325532c402510
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Mar 9 09:17:50 2020 +0000
Bug 22943: (QA follow-up) Add new cases
A few additional cases were introduced since the original bug was
authored. This patch simply catches those cases and makes the same
change.
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: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 619d6362ce895ba4da543dcd809b162ed7a9b6b5
Author: Hayley Mapley <hayleymapley at catalyst.net.nz>
Date: Mon May 27 13:57:05 2019 +1200
Bug 22943: Renames the in_ipset function to in_iprange in C4::Auth
Bug 14407 introduced a new system preference to allow limiting the
online self checkout system to an IP or IP Range. The function that
handles this is called in_ipset, which is the name of a linux tool. To
stop confusion, this patch renames the function to 'in_iprange', and the
variable 'ipset' within it to 'iprange'.
To test, follow the test plans outlined in Bug 14407 and confirm that
everything works as expected.
Sponsored-by: Catalyst IT
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: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 3b47f87b0ff5c020300108ef4fd8e4145bfccd13
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Feb 11 15:10:48 2020 +0000
Bug 24627: Correct style of clubs search results during hold process
This patch updates some markup and CSS so that the process of selecting
a club from search results during the hold process looks the same as
when selecting a patron: Club names should be links (like patron
names are) and the table row should have a hover color to help indicate
that it is clickable.
This patch also changes the markup of the Patrons/Clubs tabs a little
bit to make the information clearer: Superfluous Bootstrap-related tab
markup has been removed, and the patron and club search results have
been moved into their respective tab containers. This means that if you
search for a patron but then switch to the clubs tab the patron list
doesn't still display.
To test, apply the patch and rebuild the staff client CSS
(https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client)
- You should have more than one patron club defined.
- Begin the process of placing a hold on a title.
- Test the process of searching for both patrons and clubs.
- In each case the name (patron or club) should be an active link.
- Hovering your mouse over the table rows should change the row
background to yellow.
- Clicking the other tab at this stage should hide the search results
from your last search.
- Whether you click the linked name or elsewhere in the table row
you should be correctly redirected to the next step in the holds
process.
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 0fc78cae28db6bd79549a2d78674eb51b276600f
Author: Lucas Gass <lucas at bywatersolutions.com>
Date: Thu Mar 12 22:38:47 2020 +0000
Bug 24858: Correct labels on wording in ExcludeHolidaysFromMaxPickUpDelay
TO TEST:
- Apply patch
- mark your library closed today and tomorrow
- set ReservesMaxPickUpDelay to 1 day
- set ExcludeHolidaysFromMaxPickUpDelay to "Ignore the calendar"
- place hold, capture hold
- hold expiration date is set to tomorrow (doesn't skip closed days)
- Set ExcludeHolidaysFromMaxPickUpDelay to "Use the calendar"
- Place hold, capture hold
- hold expiration date is set to the day after tomorrow (skips closed days)
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 22f2494914a4bbec0bb4612e813515ee7412008a
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Mar 12 07:07:48 2020 -0400
Bug 24767: Hide the "Claim returned" tab if the feature is turned off
The ability to claim an item "claim returned" is not there if the syspref is empty, however, the Claim Returned tab is stil present on the patrons detail page.
Test Plan:
1) Ensure ClaimReturnedLostValue is not set
2) Note the claims tabs on the circulation and patron details pages
3) Apply this patch
4) Refresh those pages
5) The claims tabs should be gone!
Signed-off-by: Sally <sally.healey at cheshiresharedservices.gov.uk>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit c8468a92029af19ced6d1454ed4c5c3ae30aca34
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Mar 12 15:09:02 2020 +0100
Bug 5103: Refactor the code to avoid repetition
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 4432429c1e164adecff78869627168cf276c5d50
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Wed Mar 11 03:08:12 2020 +0000
Bug 5103: (follow-up) Using mapped item fields instead of hardcoding subfields
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 8d505e371fa6c5848af47d48d43872fb922dc04c
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Wed Feb 26 02:52:24 2020 +0000
Bug 5103: Format dates in MARC detail using dateformat syspref
This patch fixes the formatting of dates on the following pages:
- catalogue/MARCdetail.pl (staff)
- cataloguing/additem.pl (staff)
- opac-MARCdetail.pl (opac)
To test:
1) Ensure that the following fields are visible in the opac, intranet
and editor. You may need to edit the subfields in your default
bibliographic framework
952$d date accessioned
952$q date due/on loan
952$r date last seen
952$s date last borrowed
952$w replacement price date
Also ensure you have dateformat system preference set
2) Go to cataloguing/additem.pl for a biblio. Fill in the fields above
if required. Save
3) Remain on cataloguing/additem.pl. Notice the items table at the top
of the page, the dates are in the generic yyyy-mm-dd format
4) Go to catalogue/MARCdetail.pl for that biblio. Notice dates in wrong
format
5) View this biblio in the opac opac-MARCdetail.pl. Scroll to bottom to
items table. Notice dates in wrong format.
6) Apply patch, restart memcached and plack and refresh pages
7) Dates should now be formatted according to dateformat preference
8) Confirm that changing the preference changes the format of the dates
Sponsored-by: Catalyst IT
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 81fd7a6936d258001aa3a0f2d0ec5d7758482f45
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Mar 9 09:41:26 2020 +0000
Bug 19288: Don't show patron info for item level holds on details.pl unless hold is waiting
This persists after bug 20948 - we can still display patron information even if this patron is not the one
who will receive the item upon checkin. The holds tab can give an overview of holds and information - I think
on the details page the only info we need is whether there might be a item level hold, not who it is for
To test:
1 - Place an item level hold for delivery at a branch not matching home branch of item
2 - Place a record level hold for delivery at homebranch of item placed on hold above
3 - Enable LocalHoldsPriority with 'pickup library' matches the item's 'home library'
4 - View the details for the page, it says the item has a hold for the patron with an item level hold
5 - Check in the item, the hold triggered is for the next available patron, ignore the hold
6 - Apply patch
7 - Check details page, 'There is an item-level hold (priority=1)' with no patron info
8 - Check in, next available hold is still the one triggered
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 67ef0d870963dbc62b87071c51fd1974f0f03eef
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Fri Jul 26 15:43:02 2019 +0200
Bug 23383: fix IdRef syspref test in XSLT
IdRef link is displayed via XSLT.
There is a test of syspref with just if value is defined.
But in installer/data/mysql/sysprefs.sql you see this pref will be 0 by default, which is true in XPATH.
We should test that pref is 1.
Test plan :
1) Create a fresh UNIMARC database
2) You have pref IdRef disabled
3) Simulate a SUDOC record:
Fill a 7..$3 field with a ppn (032581270 for example).
Fill the 009 field with an integer
4) Go to the opac detail page of the record => You don't see IdRef link
5) Enable IdRef syspref
6) Go to the opac detail page of the record => You see IdRef link
7) Disable IdRef syspref
8) Go to the opac detail page of the record => You don't see IdRef link
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 90480693552e305b383bf005c1fe4f2cef705228
Author: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Date: Wed Mar 11 00:54:03 2020 +0000
Bug 24838: Fix help link for patron categories
To test:
- go to admin/categories.pl
- click Help, confirm it takes you to manual main page
- apply patch
- restart all
- click Help, confirm it takes you to patron categories in manual
Signed-off-by: Sally <sally.healey at cheshiresharedservices.gov.uk>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 63641856dd07880bc20e285e04387c162e22050c
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Oct 25 13:49:05 2019 +0000
Bug 23521: (follow-up) Add quotes
Not only should terms from facets/limits be grouped, but order should probably matter
We build a different facet for "Dillinger Girl" or "Girl Dillinger"
The parens are possibly overkill now, but I think it makes it very clear and does not hurt
To test:
1 - Follow original plan
2 - Create a new record with 'Girl Dillinger' as author
3 - Search for 'Dill*'
4 - You get all three records (and maybe others that match)
5 - Limit by 'Girl Dillinger' - you get two records
6 - Same for 'Dillinger Girl'
7 - Apply patch
8 - Limits/facets for 'Dillinger Girl' and 'Girl Dillinger' now match a isngle record
Signed-off-by: Ere Maijala <ere.maijala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit c5e367c54ebaf7ddd9cd2f1df8aa1e7f4299980a
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Thu Aug 29 15:06:14 2019 +0000
Bug 23521: Put parentheses arround limit terms
Test plan:
- Use Elasticsearch 6 (you'll need Bug 18969),
- create a biblio (#1) with "Dillinger Girl" in author and what you
want in title,
- create another biblio (#2) with the word "girl" in the title and
"Dillinger Escaplan" as author
- reindex
- search * and refine on "Dillinger Girl"
- Ko => Biblio #1 and #2 appear
- Apply this patch,
- search * and refine on "Dillinger Girl"
- Ok => anly biblio #1 appears
- use Elasticsearch 5 again
- check for no search regression
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Ere Maijala <ere.maijala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 16 +-
Koha/Manual.pm | 2 +-
Koha/SearchEngine/Elasticsearch/QueryBuilder.pm | 8 +-
catalogue/MARCdetail.pl | 7 +
cataloguing/additem.pl | 22 ++-
.../intranet-tmpl/lib/koha/cateditor/macros.js | 6 +-
.../intranet-tmpl/lib/koha/cateditor/macros/its.js | 208 ---------------------
koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss | 2 +-
.../intranet-tmpl/prog/css/src/staff-global.scss | 6 +
.../intranet-tmpl/prog/en/includes/about-team.inc | 32 +++-
.../prog/en/includes/cateditor-ui.inc | 15 +-
.../en/includes/circ-patron-search-results.inc | 3 +-
.../intranet-tmpl/prog/en/includes/clubs-table.inc | 4 +-
.../en/modules/admin/preferences/circulation.pref | 4 +-
.../prog/en/modules/catalogue/detail.tt | 10 +-
.../prog/en/modules/cataloguing/editor.tt | 1 -
.../prog/en/modules/circ/circulation.tt | 41 ++--
.../prog/en/modules/members/moremember.tt | 40 ++--
.../prog/en/modules/reserve/request.tt | 89 +++++----
.../bootstrap/en/xslt/UNIMARCslimUtils.xsl | 2 +-
opac/opac-MARCdetail.pl | 8 +
opac/sco/help.pl | 4 +-
opac/sco/printslip.pl | 4 +-
opac/sco/sco-main.pl | 4 +-
opac/sco/sco-patron-image.pl | 4 +-
t/Auth.t | 29 ++-
.../Koha/SearchEngine/Elasticsearch/QueryBuilder.t | 16 +-
27 files changed, 222 insertions(+), 365 deletions(-)
delete mode 100644 koha-tmpl/intranet-tmpl/lib/koha/cateditor/macros/its.js
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list