[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.04-104-g417e28f
Git repo owner
gitmaster at git.koha-community.org
Wed Oct 17 13:18:29 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, 18.05.x has been updated
via 417e28f14ebccdef073491b94bbbad8a80a0630d (commit)
via 2ea99b19988a3fed348d574cb06a50c8f6206f34 (commit)
via 55aebb21146978764a0062a8288abba0e56d4d8b (commit)
via 607a602ea4bc47b9beb1be2dab1f19a4eaef36a3 (commit)
via a9aa1bd1e43a871a813de1e2e97005567afa589c (commit)
via b8ad6a6532c236e473d548ad910d920ef1516ecf (commit)
via 2031603f68e2fec6097d7608d8efab7018563032 (commit)
via 0eb7160a3fc39d7860a5ed883615f12b1731d458 (commit)
via 395d0965cc115ace3daab7cc6ec8ad4832a50411 (commit)
via 4092461ec990882f204d1431e69fd6d6a70d0d1e (commit)
from 517bf773553ef941198898d5489b04c8859ded63 (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 417e28f14ebccdef073491b94bbbad8a80a0630d
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Oct 11 15:59:13 2018 +0000
Bug 21550: DataTables four button pagination uses the wrong icon for disabled buttons
This patch modifies the DataTables CSS which styles "full_nubmers"
controls which are disabled: First and Previous buttons on the first
page of results, Next and Last buttons on the last page of results.
These buttons should have gray icons instead of blue.
To test, apply the patch and clear your browser cache if necessary. View
a page which uses a "full_numbers" DataTables configuration, e.g.
- Administration -> Cities
- ILL requests -> List requests
- Circulation -> Holds to pull
Confirm that buttons in their disabled state have a gray icon and text
instead of blue.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit d9b922f46f8d551949f337f29edef6985130c8ba)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 2ea99b19988a3fed348d574cb06a50c8f6206f34
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Jul 25 14:37:59 2018 +0200
Bug 21115: Add multi_param call and add divider in cache key in svc/report and opac counterpart
Resolve things like:
CGI::param called in list context from package CGI::Compile::ROOT::usr_share_koha_prodclone_opac_svc_report line 42, this can lead to vulnerabilities. See the warning in "Fetching the value or values of a single named parameter" at /usr/share/perl5/CGI.pm line 436.
The cache key in both script looks like:
opac:report:id:602018
but should for consistency be:
opac:report:id:60:2018
Note: The 2018 here is part of the sql_params and should not be
concatenated to the report id.
Test plan:
Do not yet apply this patch.
Make a report public, set cache to 300 secs.
Check its output with opac/svc/report.
Check for the warn in your log.
Apply the patch, restart Plack and flush cache.
Check opac/svc/report.
Modify your report; e.g. add a simple string to the SELECT.
Check opac/svc/report. You should still see cached output.
Flush the cache.
Check opac/svc/report. You should now see the added text.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Tested also by clearing individual keys with $cache->clear_from_cache.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit bfbbe52ff7ff0ec93825684e4728db705b4100d1)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 55aebb21146978764a0062a8288abba0e56d4d8b
Author: Blou <philippe.blouin at inlibro.com>
Date: Thu Oct 4 13:00:08 2018 -0400
Bug 21291: (follow-up) Pass subscriptionsnumber to all tools in staff detail's sidebar
The subscriptionsnumber is required in biblio-view-menu.inc to display
the Subscription(s) tab. In detail.pl, if you click any of
Labeled MARC (you need to set the syspref viewLabeledMARC)
Hold(s)
Article requests
Checkout history
Modification log
Rota (you need to set the syspref StockRotation)
you lose the Subscription(s) tab.
This patch fixes the display by having each feature script generate that
value to be passed to the UI. I keep this separated from the first patch
since it's not exactly the same issue, and the solution might not
please.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit c6c4d82325eb7d11b34a113c69acbff18e283542)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 607a602ea4bc47b9beb1be2dab1f19a4eaef36a3
Author: Blou <philippe.blouin at inlibro.com>
Date: Thu Aug 30 10:33:44 2018 -0400
Bug 21291: request-article.pl doesn't show MARC, LabeledMARC and ISBD in sidebar
When on a detailed record in the intranet, any click on the sidebar
will lead you to another page with the same sidebar EXCEPT for "Article
requests".
When clicking on article requests, you get a new sidebar without
MARC
Labeled MARC
ISBD
This fix adds the required C4::Biblio::enabled_staff_search_views that
loads the required hash with the permissions.
TEST
0) login with a user having all rights
1) go to any detailed notices, notice the sidebar on the left
2) click on MARC
3) notice the sidebar is the same in the new page
4) click on Request articles
5) notice the missing labels on the sidebar
6) apply patch, redo steps
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit ab13b53854e0aa726c8112d8f31cc553484637bd)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit a9aa1bd1e43a871a813de1e2e97005567afa589c
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Fri Feb 2 14:34:34 2018 +0100
Bug 20131: Inventory optional filters correct "For loan" addition
In inventory, optional filters are build from authorize values categories used for items.notforloan, items.itemlost, items.withdrawn and items.damaged.
The bug is that description of value 0 is always "For loan".
This seems to be only for "notforloan".
Second bug is that if a description exists for "notforloan" value 0, it is not used.
This patch corrects by adding "For loan" only for "notforloan" authorized values and if there is no 0 value.
It changes the description added by code from "ignore" to a more unlikly user defined "__IGNORE__".
Test plan:
1) Make sure you have authorized values defined on items.notforloan, say "NFL" category, with at least a value and description but no 0 value
2) Make sure you have authorized values defined on items.itemlost, say "LOST" category, with 0 = "Not lost" and 1 = "Lost"
3) Go to inventory /cgi-bin/koha/tools/inventory.pl
4) Without patch you see "For loan" on both items.notforloan and items.itemlost
5) With patch you see "For loan" only in items.notforloan, you see for items.itemlost : "Not lost" and "Lost"
6) Create in authorized values category "NFL" a value 0 with description "Available"
7) Go to inventory /cgi-bin/koha/tools/inventory.pl
8) Without patch you see "For loan" in items.notforloan for value 0
9) With patch you see "Available" in items.notforloan for value 0
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 8d9284668c6de2d5fbfc4079a8b0516ba1645876)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit b8ad6a6532c236e473d548ad910d920ef1516ecf
Author: Baptiste Wojtkowski <baptiste.wojtkowski at biblibre.com>
Date: Tue May 23 08:54:00 2017 +0000
Bug 18655: Correct the choose link in unimarc_field_210c value builder
- Link 'choose' is now a button.
- It doesn't call directly javascript anymore (use of listener).
- field to load stored in html on the page (less escaping needed).
Test plan :
1) Use UNIMARC catalog
2) Define unimarc_field_210c value builder on 210$c
3) Define an autority type EDITORS with heading on 200$b
4) Create an autority of this type with a single quote in heading, ie : l'avenir
5) Index this new autority
6) Edit a biblio record and launch 210$c value builder
7) Search for new autority
8) Click on 'Choose'
=> Heading should be pasted in 210$c
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 9965aa43e15aaa63fd8999daa98618d20698e89b)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 2031603f68e2fec6097d7608d8efab7018563032
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Oct 8 11:47:15 2018 +0100
Bug 21113: Corrections to patron merge confirmation prompt
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit c6198717c4be56ba99deb57aa6d117d23a032eea)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 0eb7160a3fc39d7860a5ed883615f12b1731d458
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Oct 10 15:02:14 2018 +0000
Bug 21537: Fix typo for options_for_item_types
To test:
0 - Set UseACQFrameworkForBiblioRecords to 'Use'
1 - Define a subfield in the ACQ framework linked to authorised value
'itemtypes'
2 - Make sure that field is visible
3 - Create a purchase suggestion
4 - Accept it
5 - Go to Acquisitions
6 - Find a vendor with an open basket, or create one
7 - Add to the basket using a suggestion
8 - Choose the suggestion
9 - Internal server error
10 - Apply patch
11 - Place order form a suggestion again
12 - Confirm that the field linked to itemtypes shows correctly
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 959162b2f3c9689bb56433ee08c300b40822d700)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 395d0965cc115ace3daab7cc6ec8ad4832a50411
Author: Ere Maijala <ere.maijala at helsinki.fi>
Date: Mon Sep 17 01:13:55 2018 +0300
Bug 21365: Call BiblioAutoLink from AddBiblio and ModBiblio
This makes e.g. the advanced MARC editor, and anything that uses AddBiblio or
ModBiblio honor BiblioAddsAuthorities.
To test:
1. Make sure BiblioAddsAuthorities and AutoCreateAuthorities preferences are enabled.
2. Add a new record using advanced editor (enable EnableAdvancedCatalogingEditor to
use it), include a previously non-existing author.
3. Save the record and observe the author get an authority number.
4. Add another author, save the record and make sure it also gets an authority number.
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 1a8e1165ca7abf9e2b7e5c7de0cdf26cbd4e30ac)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 4092461ec990882f204d1431e69fd6d6a70d0d1e
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Oct 10 13:43:40 2018 +0200
Bug 21279: Fix in transport cost matrix
Test plan:
On Home › Administration › Transport cost matrix you should no longer
see " ".
Fill some values and save, you should see the correct values.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 1fddd295b8e83b60f2b838f09f3175c5acfeec28)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Biblio.pm | 8 ++++++++
acqui/addorderiso2709.pl | 6 +-----
acqui/neworderempty.pl | 3 ---
catalogue/issuehistory.pl | 2 ++
catalogue/labeledMARCdetail.pl | 2 ++
cataloguing/addbiblio.pl | 3 ---
circ/request-article.pl | 4 ++++
koha-tmpl/intranet-tmpl/prog/css/datatables.css | 20 ++++++++++++++++++++
.../prog/en/modules/acqui/neworderempty.tt | 3 ++-
.../prog/en/modules/admin/transport-cost-matrix.tt | 4 ++--
.../value_builder/unimarc_field_210c.tt | 15 +++++++++++----
.../prog/en/modules/patron_lists/list.tt | 4 ++--
.../prog/en/modules/tools/inventory.tt | 4 ++--
opac/svc/report | 4 ++--
reserve/request.pl | 2 ++
svc/report | 4 ++--
tools/inventory.pl | 2 +-
tools/viewlog.pl | 2 ++
18 files changed, 65 insertions(+), 27 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list