[koha-commits] main Koha release repository branch master updated. v20.05.00-391-g1a505632b8
Git repo owner
gitmaster at git.koha-community.org
Fri Jul 24 14:42:25 CEST 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 1a505632b8d1300a02512cfe300056f7b3797bfb (commit)
via 3b9c0f338bdacb579ef4d68d1e3dc85515419929 (commit)
via 4cf04214d381dd9a9eed28a2ee24e0c01eaaf36f (commit)
via 9a6b28a914269356e27054811e0d87fc10c12a7d (commit)
via 58075331a9e68db0539d59abb4f1a4f215a12120 (commit)
via 2b902c7b7512851027c92cf629fd7796d1c8035d (commit)
via 4eac2298592ef7d75bd6575cb2e823aeeace8f9d (commit)
via e14c1702b446111f98ce6736aa7544df14b03d1d (commit)
via 664c0de114be2c47786e570b316f941ade337d1f (commit)
via a64368e1fd16d73a87fdda37fc0851743e4ad6db (commit)
via 784e4685de0934c939f7047bcea191088169d824 (commit)
via fa8c57e55d3f3cc027bc6e9d0fdf8dad81555453 (commit)
via 6b6cea9d64f255cce481012a30a0ae3298e160b2 (commit)
from d2e191c3fff9ef68bf7104b72922ded77e9d5217 (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 1a505632b8d1300a02512cfe300056f7b3797bfb
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Fri Jul 17 23:36:24 2020 +0000
Bug 26016: Fix capitalization for "MARC Preview"
To test:
- Go to any record in the staff catalog
- Check the display for the 'MARC Preview' link
- Apply patch
- It should have changed to 'MARC preview'
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 3b9c0f338bdacb579ef4d68d1e3dc85515419929
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed Jul 22 10:09:29 2020 +0100
Bug 20799: (QA follow-up) Move syspref check
This patch moves the syspref check into the controller to save a DB
query if the module is not enabled.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
JD - amended patch: removing trailing parenthesis in the IF statement
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 4cf04214d381dd9a9eed28a2ee24e0c01eaaf36f
Author: Katrin Fischer <katrin.fischer at bsz-bw.de>
Date: Mon Jun 29 17:56:31 2020 +0200
Bug 20799: (follow-up) Add ILLModule system preference check and fix display for no requests
When there were no requests the label would still display, using .count fixes this.
Also adds a check on the ILLModule system preference to prevent the information from
showing when the ILL module is deactivated.
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9a6b28a914269356e27054811e0d87fc10c12a7d
Author: Magnus Enger <magnus at libriotech.no>
Date: Mon Dec 9 17:48:35 2019 +0100
Bug 20799: Add link from biblio to ILL detail view
Some ILL systems (e.g. Libris in Sweden) require a link between
a biblio and an ILL request. When such a link exists it is nice
to display an actual link from the biblio detail view to the
ILL request detail view. This patch adds such a link. For users
without ILL privileges, the requests should still show, but not
be clickable links.
To test:
- Make sure you have a couple of ILL requests created with the
FreeForm backend. (FreeForm does not let you tie a request to
a biblio through the UI, but we will add connections directly
in the database.) Lets assume these have illrequest_id's a and b.
- Make sure you have a record, let's call the biblionumber x.
- Apply the patch and make sure there are no changes in the biblio
detail view of biblionumber x.
- Log into the database and connect the biblio to the first request:
UPDATE illrequests SET biblio_id = x where illrequest_id = a;
- Check that the biblio detail view now says this:
"ILL requests: Request a"
- Verify that the "Request a" part is a working link to the detail
view of ILL request a.
- Do this in the database:
UPDATE illrequests SET biblio_id = x where illrequest_id = b;
- Check that the biblio detail view now says this:
"ILL requests: Request a, Request b"
- Verify the links work as expected.
- Log in as a staff user and check that the requests are still
listed, but not displayed as clickable links.
- Sign off
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 58075331a9e68db0539d59abb4f1a4f215a12120
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jul 24 14:10:52 2020 +0200
Bug 23092: DBRev 20.06.00.016
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 2b902c7b7512851027c92cf629fd7796d1c8035d
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Jun 16 13:51:00 2020 +0100
Bug 23092: Add unit tests
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 4eac2298592ef7d75bd6575cb2e823aeeace8f9d
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Jan 17 12:04:07 2020 +0000
Bug 23092: Add 'daterequested' to branchtransfers table
Signed-off-by: Nick Clemens <nick 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>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit e14c1702b446111f98ce6736aa7544df14b03d1d
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Mon Sep 30 09:28:40 2019 +0000
Bug 23696: take deleted biblios into account when building oai sets
Test plan:
0) do not apply the patch
1) set up OAI and create at least one set
2) run build_oai_sets.pl
3) remember/write down number of records added
4) delete a biblio, the is included in set
5) run buid_oai_sets.pl again
6) the set is 1 record smaller
7) apply the patch
8) run build_oai_sets.pl
9) the number of record should be the same as in 3)
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 664c0de114be2c47786e570b316f941ade337d1f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jul 24 14:09:03 2020 +0200
Bug 25031: Compiled CSS
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit a64368e1fd16d73a87fdda37fc0851743e4ad6db
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Jul 24 11:19:24 2020 +0000
Bug 25031: (follow-up) Fix markup error and restore cover class
This patch corrects a markup error that appears when no cover image
services are enabled. An unclosed <div> caused links on the page to
break.
This patch also restores a part of the cover-handling script which adds
a bordered style to the cover image "tiles"
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 784e4685de0934c939f7047bcea191088169d824
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Jul 23 19:49:33 2020 +0000
Bug 25031: (QA follow-up) Avoid displaying extra navigation
This patch reworks the construction of the navigation links in such a
way that they are built during a loop over an updated jQuery object.
Previously the stored variable might not reflect that some elements
had been removed.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit fa8c57e55d3f3cc027bc6e9d0fdf8dad81555453
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Jun 17 21:45:00 2020 +0000
Bug 25031: (QA follow-up) Improve handling of one or fewer images
This patch addresses a few issues raised during QA:
1. If there are no images, avoid the momentary appearance of an empty
borered box. The class controlling the appearance of the box is now
added after initialization.
2. If there is only one image, remove the control for switching
between covers.
3. Add "preventDefault" to cover naviation click handler.
4. Correct translation function in localcovers.js.
This patch modifies SCSS, so rebuilding the staff client CSS is
necessary for testing.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 6b6cea9d64f255cce481012a30a0ae3298e160b2
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Mar 31 21:37:18 2020 +0000
Bug 25031: Improve handling of multiple covers on the biblio detail page in the staff client
This patch modifies the template, JS, and CSS for the bibliographic
detail page in order to gracefully handle multiple cover images.
The changed version loops through any cover images which might be
embedded and checks that they are successfully loaded. Only
successfully-loaded images are shown. Only the first image is shown, and
the others can be "paged through" using generated navigation controls.
To test, apply the page and rebuild the staff client CSS
(https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client).
Enable multiple cover image services. The patch was developed with these
services available:
- Amazon
- Local cover images (including multiple local cover images)
- Coce (serving up Amazon, Google, and OpenLibrary images)
- Images from the CustomCoverImages preference
View a variety of titles and confirm that the cover images are
displaying correctly, whether there be 0, 1, 2, or more covers
available.
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
Koha.pm | 2 +-
Koha/Schema/Result/Branchtransfer.pm | 18 +-
catalogue/detail.pl | 8 +
installer/data/mysql/kohastructure.sql | 1 +
installer/data/mysql/updatedatabase.pl | 17 ++
koha-tmpl/intranet-tmpl/js/coce.js | 78 ++++----
.../intranet-tmpl/prog/css/src/staff-global.scss | 37 ++++
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +-
.../intranet-tmpl/prog/en/includes/js_includes.inc | 4 -
.../prog/en/modules/catalogue/detail.tt | 201 ++++++++++++++++-----
koha-tmpl/intranet-tmpl/prog/js/localcovers.js | 50 ++---
misc/migration_tools/build_oai_sets.pl | 7 +-
t/db_dependent/Koha/Item/Transfers.t | 43 ++++-
13 files changed, 339 insertions(+), 129 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list