[koha-commits] main Koha release repository branch 17.11.x updated. v17.11.10-34-gf5eb412
Git repo owner
gitmaster at git.koha-community.org
Wed Oct 10 12:58:38 CEST 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, 17.11.x has been updated
via f5eb412f34816cb251f621852c9ef843856f298e (commit)
via cf12d9ba72be3c4f41d3eb7d640e968fca129ffa (commit)
via 8f13b25a177fdd46453fecb38511809792469364 (commit)
via bde08fa3661b895fc7881bd1523c36761c4667d9 (commit)
via 2905a9e16850a089339943a65fcfadadceabe0f0 (commit)
via f13910a1f7307ea2851cab5e3f1cfa444aba3beb (commit)
via 10eb6cb65ebd917bf34872fb3efe98e7a37648fe (commit)
from b8ee0a2cf5e9e35c948b46365c969e20434d1f36 (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 f5eb412f34816cb251f621852c9ef843856f298e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jul 31 15:24:10 2018 -0300
Bug 21133: [18.05.x] Fix use statements order
Basically the idea is:
1. Undefined subroutine &C4::Items::ModZebra called at /home/vagrant/kohaclone/C4/Items.pm line 302.
=> Then use C4::Items before C4::Biblio
2. Undefined subroutine &C4::Circulation::GetItem called at /home/vagrant/kohaclone/C4/Circulation.pm line 1290
=> Then use C4::Circulation before C4::Items
And sometimes these 2 rules do not work...
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 6427906fcccea22327db3c1d78847fed5ba9e7fb)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit cf12d9ba72be3c4f41d3eb7d640e968fca129ffa
Author: Pasi Kallinen <pasi.kallinen at joensuu.fi>
Date: Fri Aug 24 11:05:04 2018 +0300
Bug 20785: Advanced Editor does not honor MarcFieldDocURL
The advanced MARC editor, Rancor, doesn't obey MarcFieldDocURL.
Make it do so.
Test plan:
1) Enable EnableAdvancedCatalogingEditor
2) Set MarcFieldDocURL to eg. http://{MARC}.example.com/{LANG}/{FIELD}
3) Go to Cataloging -> Advanced editor
4) Go to any field and press Ctrl-H
5) Marc field documentation on www.loc.gov or ifla.org should open
6) Apply patch
7) Repeat 3 and 4. The Marc field docs should open on the URL you set
Signed-off-by: Pasi Kallinen <pasi.kallinen at joensuu.fi>
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 ca839922fd4bf3c455454f6dd9182203b1481831)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 0f2d80328d74c661ecd318f603a18743e3c699bb)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 8f13b25a177fdd46453fecb38511809792469364
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Sat Jul 14 14:29:53 2018 +0000
Bug 21078: overdrive.js Catch error if window.opener is not accessible
To Test:
0 - Enable overdrive search results on your koha
1 - From a source develop a link to your koha instance that opens a new
window:
<a target="_blank"
href="http://localhost:8080/cgi-bin/koha/opac-search.pl?q=love">Test</a>
2 - Click that link
3 - Note Overdrive results do not load
4 - Note error in JS console
5 - Apply patch
6 - Click the link again
7 - Note OD results load
8 - Note no error in console
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>
(cherry picked from commit 6975a6836a21f42675a9394602246891c19d9522)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 20b0ca1f63c6ad97a05476236036996058b784c2)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit bde08fa3661b895fc7881bd1523c36761c4667d9
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sat Aug 11 23:55:35 2018 +0000
Bug 20241: Fix display of publication year in subscription record search for MARC21
The old problem: UNIMARC uses biblio.publicationyear, MARC21 uses
biblio.copyrightdate. Patch adds a fallback, if there is nothing
in publicationyear, copyrightdate will be displayed.
To test:
- In a MARC21 database
- Add a new subscription
- Search for records
- Verify the publication year column remains empty
- Apply patch
- Repeat search
- Verify that the year now shows
https://bugs.koha-community.org/show_bug.cgi?id=20421
Signed-off-by: Michal Denar <black23 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 8df47bdde678773f028f312b4cd8000a12425281)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 419f889bb0e0220d81b9883d27aeea128a5b8888)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 2905a9e16850a089339943a65fcfadadceabe0f0
Author: Ere Maijala <ere.maijala at helsinki.fi>
Date: Fri Oct 13 14:07:21 2017 +0300
Bug 21362: Advanced editor: Fix tab navigation in fixed fields
Also minor tweaks to how the fields look.
Test plan:
1. Try moving from field to field and inside control fields with tab/shift-tab.
2. Make sure focus doesn't get stuck in any position.
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 024643f51c4e0ca1803dd5013bb857e98cd924e5)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit e74f433418e4494c68e996c6d1061d485d67c49e)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit f13910a1f7307ea2851cab5e3f1cfa444aba3beb
Author: Jon Knight <J.P.Knight at lboro.ac.uk>
Date: Mon May 14 15:30:55 2018 +0000
Bug 16739: Show note instead of 500 error for 'Generate EDIFACT' when no EDI account is configured
When a book seller (vendor) does not have EDI account information configured
the basketgroup display still shows a button to generate EDIFACT output which
results in 500 error when clicked. This patch fixes two aspects of this:
a) it stops the button being displayed in the first place, replacing it with
a message that explains there is not EDIFACT configuration for the vendor.
b) if, somehow, an edifact print operation is passed to the basketgroup
script it detects the lack of an EAN and redirects back to the basket group
display page with a warning message.
To test:
1) Create a vendor with no EDI details.
2) Create a basket with some items in, then close it and add it to a basket
group for this vendor.
3) Go to that vendor's basket groups, click on the "Closed" tab and then
click on the 'generate edifact order' button. You should get a 500 error.
4) Apply this patch.
5) Repeat 3, except this time you should find that the 'generate edifact
order' button has been replaced with a note that there is
"No EDIFACT configuration for <vendor>".
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>
(cherry picked from commit 121b8105bcb00909b1e8081442148c1939c101a6)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 43b6644818f71c2d3c4bf09c6c40b36f5c0522c2)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 10eb6cb65ebd917bf34872fb3efe98e7a37648fe
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sat Sep 22 11:08:16 2018 -0300
Bug 21398: Make search field mandatory when adding to a basket from an existing record
Test plan:
- Create a basket
- Click the "Add to basket" button
- Click "Search" on the first line
=> Without this patch you get an ugly screen: https://snag.gy/U8X3ZK.jpg
=> With this patch applied you will not be able to submit without
filling the input in
QA note: Yes, we could handle that controller side as well, but much
more work.
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>
(cherry picked from commit bf89e4e124fb38982fa8b9708af1fb67fd16f982)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 01588a68aa74c6fe32329178840e9cc542e2829c)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
-----------------------------------------------------------------------
Summary of changes:
acqui/basketgroup.pl | 30 +++++++++++++---
.../intranet-tmpl/lib/koha/cateditor/widget.js | 37 ++++++++++++++------
koha-tmpl/intranet-tmpl/prog/css/cateditor.css | 5 ++-
.../en/includes/acquisitions-add-to-basket.inc | 2 +-
.../prog/en/includes/cateditor-ui.inc | 9 ++++-
.../prog/en/modules/acqui/basketgroup.tt | 27 ++++++++------
koha-tmpl/opac-tmpl/bootstrap/js/overdrive.js | 3 +-
serials/subscription-bib-search.pl | 2 +-
t/db_dependent/Circulation/Branch.t | 2 +-
t/db_dependent/Circulation/Chargelostitem.t | 2 +-
t/db_dependent/Circulation/CheckIfIssuedToPatron.t | 9 ++---
.../Circulation/GetPendingOnSiteCheckouts.t | 2 +-
t/db_dependent/Circulation/IsItemIssued.t | 2 +-
.../Circulation/IssuingRules/maxsuspensiondays.t | 2 +-
t/db_dependent/Circulation/Returns.t | 4 +--
t/db_dependent/Circulation/SwitchOnSiteCheckouts.t | 4 +--
t/db_dependent/Circulation/TooMany.t | 4 +--
t/db_dependent/Circulation/issue.t | 4 +--
t/db_dependent/Circulation/transfers.t | 4 +--
t/db_dependent/CourseReserves.t | 4 +--
t/db_dependent/Holds.t | 9 ++---
.../Holds/DisallowHoldIfItemsAvailable.t | 2 +-
t/db_dependent/Holds/LocalHoldsPriority.t | 2 ++
t/db_dependent/Holds/RevertWaitingStatus.t | 14 ++++----
t/db_dependent/Items.t | 7 ++--
.../Items/AutomaticItemModificationByAge.t | 2 +-
t/db_dependent/Items/DelItem.t | 7 ++--
t/db_dependent/Koha/Patrons.t | 3 +-
t/db_dependent/Labels/t_Batch.t | 2 +-
t/db_dependent/Members/GetAllIssues.t | 2 +-
t/db_dependent/Members/IssueSlip.t | 2 +-
t/db_dependent/Patron/Borrower_Discharge.t | 4 +--
t/db_dependent/Reserves.t | 2 +-
t/db_dependent/RotatingCollections.t | 4 +--
t/db_dependent/ShelfBrowser.t | 2 +-
t/db_dependent/api/v1/holds.t | 2 +-
36 files changed, 136 insertions(+), 88 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list