[koha-commits] main Koha release repository branch 19.05.x updated. v19.05.00-49-gff651b8
Git repo owner
gitmaster at git.koha-community.org
Tue Jun 11 17:54:17 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, 19.05.x has been updated
via ff651b84e8d99496bc330c4e8e0925234f30def9 (commit)
via 8981df1cf0c2761dc891870aa780716f30d4be1f (commit)
via 9ea56e1cd958d225be0ba7e1861804b7ce7e8542 (commit)
via 3cd32c995e7fc2caeee3a3eed63b426226524057 (commit)
via c6464d55601f98746ac7327141e538484a8842f2 (commit)
via 21cff327830a04f51dd568b63013b0a53a725f7a (commit)
via 2f9ec9c61fabd7595da594c02a55395564cb2330 (commit)
via 2900debc65318237ee95fa6c5dbbbd69c8a7e6c4 (commit)
via fb362dfd795080a6bcb547e5bc1d87d18bc7ffdf (commit)
via cf681f6682eee0aea6ae647835a628d88fa180b9 (commit)
via f8b24adc75ef145b96556893d555de4971b8251d (commit)
via a249ed65075958772f28b0fb7f9f0b2755e41f5d (commit)
via 5d0f6f8cbb42ac85d6648f1e0d45af359604021f (commit)
via 648587b19c7e8ca4a91b9930c7d6c78fbeb2da0f (commit)
via c42c44e932133e6df6c3b9ccda30932d2835f5ee (commit)
from e69744172a33165758562c6c786a1135361c7509 (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 ff651b84e8d99496bc330c4e8e0925234f30def9
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Mon Mar 11 08:33:13 2019 +0000
Bug 13094: Make it easy to hide 'Cancel all' button on holds over report
This patch makes some small modifications to the 'Holds awaiting pickup'
report:
- Fixes typo sypref
- Fixes 'Home branch' to 'Home library'
- Adds a span to easily hide the cancel all button with CSS
To test:
- Make sure you have a hold appearing on the awaiting pickup list
second tab: Holds waiting over...
- Verify the 'cancel all' button on top shows
- Verify syspref and Home library changes mentioned above
- Add #holdsover-cancel-all { display:none; } to IntrentUserCSS
- Verify that the button and the text have vanished
Note: If the text doesn't display next to the button, try toggling
the TransferWhenCancelAllWaitingHolds system preference.
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 39e4c6c5d791853985773e4032357372f77d7587)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 8981df1cf0c2761dc891870aa780716f30d4be1f
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Mar 25 13:55:43 2019 -0400
Bug 18344: 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>
(cherry picked from commit 60e24be115539daedc4172099eec9cc5dd5bc813)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 9ea56e1cd958d225be0ba7e1861804b7ce7e8542
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Mar 28 11:05:28 2017 +0000
Bug 18344: Allow overdue fines cap at replacement price, and cap by amount to work together
There is no reason that a library shouldn't be able to use the monetary
fines cap and the replacement price cap at the same time. The code is
written in such a way that they already work harmoniously. We have
librarians who wish to use both so they can set a high cap of $10.00 but
also use the replacement price cap so that a $20.00 book would only get
a fine of $10.00, but a $5.00 paperback will only get a fine of $5.00
Test Plan:
1) Apply this patch
2) Create a rule with a fines cap of $10, *and* a cap at replacement price, and a daily fine of $1
3) Create two items, one with a replacement price of $5 and one with a
replacement price of $15
4) Check out these items to a patron, backdate the checkouts so they are
already overdue by a couple months
5) Check the items in ( make sure calc fine at checkin is enabled for
you )
6) Note the one item has a fine of $5 and the other has a fine of $10!
Signed-off-by: David Kuhn <techservspec at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit e702ff89f77e50b1bcef1cdc1548627957251df0)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 3cd32c995e7fc2caeee3a3eed63b426226524057
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Jun 5 13:55:10 2019 +0000
Bug 23053: Add phrase index to authority Local-Number
To test:
1 - Define a matching rule for authorities on field 001 index Local-Number
2 - In koha-conf.xml raise the zebra_loglevels
<zebra_loglevels>none,fatal,warn,request,info</zebra_loglevels>
3 - Export some authorities using the tools->export data
4 - Import those authorities
5 - Note no matches found
6 - View the zebra output log, you should see lots of error 114
7 - Apply patch
8 - Copy the indexdefs files to the installed versions
9 - Reapply matchign rules to staged files
10 - Matches should now be found
11 - Logs should not have errors
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: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 2e8a6a4b097f7ed7bb33efe819693752abba33cb)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit c6464d55601f98746ac7327141e538484a8842f2
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Jun 7 12:10:01 2019 +0000
Bug 23076: Include OpacUserJS on OPAC maintenance page
This patch coverts the syntax for embedding OpacUserJS in the global
include file so that it uses 'Koha.Preference' syntax. This makes the
data available in templates, like the OPAC maintenance page, to which
the preference data has not been explicitly provided.
To reproduce: Add some JavaScript to the OPACUserJS system preference
which will let you know it's working. For instance:
alert("OPACUserJS!");
Turn on the OPAC maintenance message using the OpacMaintenance system
preference. Navigate to the OPAC. You should see the system maintenance
page but you should not see an alert.
To test, apply the patch and reload the OPAC page. Your alert should
show.
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
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>
(cherry picked from commit 82dcb5cf546c881af0003c272d9326e12fb5f1ce)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 21cff327830a04f51dd568b63013b0a53a725f7a
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Fri Jun 7 10:18:05 2019 +0200
Bug 22915: fix Mana URL in etc/koha-conf.xml
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 8427b684148944b9306fd4786c75c53527037024)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 2f9ec9c61fabd7595da594c02a55395564cb2330
Author: Pasi Kallinen <pasi.kallinen at koha-suomi.fi>
Date: Wed May 29 09:20:43 2019 +0300
Bug 22910: Do not copy unique patron attributes to duplicated patron
When creating a new patron by duplicating another, all of the patron
attributes are also copied into the form. Some of those value may be
unique, so don't copy those.
1) Create patron attribute types, one with "unique identifier", one without.
2) Create or a patron so it has values in both of those attributes.
3) Duplicate the patron
4) The edit form should retain the values from the "original" patron.
5) Apply patch.
6) Duplicate the patron - this time the attributes with unique values
are cleared.
Signed-off-by: Pasi Kallinen <pasi.kallinen at koha-suomi.fi>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit f3358e97c8a1f9edf1c4de6dea46f70366237699)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 2900debc65318237ee95fa6c5dbbbd69c8a7e6c4
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Thu Sep 27 19:49:27 2018 +0200
Bug 20986: (follow-up) Avoid br tags, but allow for line breaks to be added easily with CSS
This patch removes the br tags from the XSLT in favor of some more
spans and classes.
This will allow to add the line breaks with one line of CSS:
span.holdings_note_data { display:block; }
Signed-off-by: Liz Rea <wizzyrea 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>
(cherry picked from commit 65de22a6ef928bd6074e9a4d6a1e1351d0e1de9b)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit fb362dfd795080a6bcb547e5bc1d87d18bc7ffdf
Author: Joy Nelson <joy at bywatersolutions.com>
Date: Fri Jun 22 15:22:40 2018 -0700
Bug 20986: Add 867 and 868 holdings display
Add line breaks in the 866 Holdings display in the OPAC details and Staff details page. Add 867 and 868 textual holdings with line breaks in the OPAC and Staff details display.
Signed-off-by: Ed Veal <eveal at mckinneytexas.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Liz Rea <wizzyrea 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>
(cherry picked from commit c23276324c4da519130f35cb7c471402965b3e1b)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit cf681f6682eee0aea6ae647835a628d88fa180b9
Author: Liz Rea <wizzyrea at gmail.com>
Date: Thu May 9 02:02:55 2019 +0000
Bug 8558: (QA follow-up) a little more text clean up
You can take or leave it, honestly, I just thought
we could be a little more explicit about what we were overwriting.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 6d046c2e3d301a7e1d37b376b49a0db516e67bda)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit f8b24adc75ef145b96556893d555de4971b8251d
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Mon Apr 29 03:30:30 2019 +0000
Bug 8558: Improve confirmation message for importing frameworks
This patch updates the confirmation message from:
"Do you really want to import the framework fields and subfields? This
will overwrite the current configuration. For safety reasons please use
the export option to make a backup"
to:
"Are you sure you want to import the [% frameworkcode %]
framework structure? This will overwrite the current configuration. For
safety reasons, it is recommended to use the export option to make a
backup first."
To test:
1) Go to Administration -> MARC bibliographic frameworks
2) Export one of the frameworks
3) Create a new test framework
4) Import the new test framework structure using the exported file
5) Upon clicking Confirm, confirm the message is improved and makes
sense.
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: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit e4d1318550af78f76b7a43757bbdc4c5bddb4d5f)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit a249ed65075958772f28b0fb7f9f0b2755e41f5d
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Jun 6 15:32:14 2019 +0100
Bug 10215: DBRev 19.05.00.002
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit c3346b50bd00778c2e8364b40a7dd7a891c713b4)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 5d0f6f8cbb42ac85d6648f1e0d45af359604021f
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed Jun 5 12:58:20 2019 +0100
Bug 10215: (follow-up) Fix the failing test
We now handle NULL values at the database end and do not expect empty
strings.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 117061d88420231d709515f4702446e60f7de4b6)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 648587b19c7e8ca4a91b9930c7d6c78fbeb2da0f
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed Jun 5 12:54:30 2019 +0100
Bug 10215: (follow-up) Correct existing data
This patch adds the correction of data ('' => NULL) during the DB
update.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 9713e13893c9f2d2b12cea29b23b72a25170462e)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit c42c44e932133e6df6c3b9ccda30932d2835f5ee
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue May 7 12:49:03 2013 -0400
Bug 10215: Increase the size of opacnote and librariannote for table subscriptionhistory
We have librarians that are regularly hitting the maximum number of
characters for the note fields in subscription history. They would like
to be able to store at least 1000 characters here. Converting the
varchar(150) to text should do it.
Test Plan:
1) Apply this patch
2) Run updatedatabase.pl
3) Add public and private notes to a subscription history entry
where each note is greater than 150 characters.
4) Save and view the notes, the notes should not be truncated.
Rescued-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 8592474c3fe6af408c7265a50bd1776a76942397)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Serials.pm | 1 +
Koha.pm | 2 +-
etc/koha-conf.xml | 2 +-
.../authorities/authority-koha-indexdefs.xml | 1 +
.../authorities/authority-zebra-indexdefs.xsl | 2 +-
installer/data/mysql/kohastructure.sql | 4 +-
installer/data/mysql/updatedatabase.pl | 13 ++++++
.../prog/en/includes/waiting_holds.inc | 2 +-
.../prog/en/modules/admin/biblio_framework.tt | 3 +-
.../prog/en/modules/admin/smart-rules.tt | 3 --
.../prog/en/modules/circ/waitingreserves.tt | 37 ++++++++--------
.../prog/en/xslt/MARC21slim2intranetDetail.xsl | 41 ++++++++++++++---
.../intranet-tmpl/prog/js/biblio_framework.js | 3 +-
.../bootstrap/en/includes/opac-bottom.inc | 6 +--
.../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 40 ++++++++++++++---
members/memberentry.pl | 4 +-
t/db_dependent/Circulation/CalcFine.t | 46 +++++++++++++++++++-
t/db_dependent/Serials.t | 4 +-
18 files changed, 166 insertions(+), 48 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list