[koha-commits] main Koha release repository branch master updated. v18.11.00-1397-g7de4511
Git repo owner
gitmaster at git.koha-community.org
Mon Apr 29 18:37:55 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, master has been updated
via 7de4511cef9c7204ff039356775ff3d59ceefc44 (commit)
via 0ecd8c2f8cbe50407babed026a462e98592a3010 (commit)
via e5dbc76fff52c63695b3670667e73a95c3309402 (commit)
via b46312dde9bd70a24cf744eacb3beeb37cc880b4 (commit)
via d99d32d033935f09b7c361177ac4b43f08b8c14a (commit)
via 29c687bff71c2530adeaaf2bdfbfa1ea565ba5e5 (commit)
via ffb432df7801498e2eefe9daaa19dbb563090716 (commit)
via c5a98ed3e1dff26a6e0c1482663891694ec7cf98 (commit)
via f98037ac53f74a664f7ea1bdbe63d884fd5f4c6f (commit)
via 26a61c97f07a5a7354e1ae123f43d4cf13fbc5fb (commit)
via de47e59be5482d7d6e2611c3ceea0e42928404b2 (commit)
via 968eea155e676ceaf89ad34a6cf9a90f6ae0e37d (commit)
via d51054c8b45a1c18a4e2bcf5272258a1ea523c8f (commit)
via e890cc42fda64b2bab3b0f26d66f5db60d2bdf4d (commit)
via aa75553c3a84b89ac433aa3e1809b9855853f4bc (commit)
via e9f0212f352c01b83c1505226587b5e4da2a115b (commit)
via 7d4126e278b0b4949e89afdb683c091ed6c089f5 (commit)
via 81a614a0f5f79e7d54e0febf6d9ded0595a92977 (commit)
via 40f6822dc1b6abc3e2c1b0a408db4d52d9c42eb5 (commit)
via d559f93151ceaff3036d6f1fbe6666fb2075756f (commit)
via 99b2b2b6a70a6059ce862f3f89275c8dce99bd95 (commit)
via 9fff134de69e59c047f54c1536a69b759ee11ab8 (commit)
via dd4877706a378ab939ba9c6094c6a949b112864e (commit)
via c5647b4f6275b987e0c73c638de2b1b4d3c26015 (commit)
via 64cc8f737b42870b26488c2f372c26cf298a15f1 (commit)
via 3d022dc20ea34ba5fb2d37f7399b6d07be3cdea8 (commit)
from 5a63c5baa23c5f8b1fdd343995f360147f519d4b (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 7de4511cef9c7204ff039356775ff3d59ceefc44
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Apr 29 12:16:59 2019 -0400
Bug 8995: Compiled CSS
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 0ecd8c2f8cbe50407babed026a462e98592a3010
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Apr 29 16:12:15 2019 +0000
Bug 8000: DBRev 18.12.00.067
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit e5dbc76fff52c63695b3670667e73a95c3309402
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Apr 29 16:09:00 2019 +0000
Bug 8995: DBRev 18.12.00.066
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b46312dde9bd70a24cf744eacb3beeb37cc880b4
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Apr 25 10:39:14 2019 +0100
Bug 8995: (QA follow-up) Convert db update to perl
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit d99d32d033935f09b7c361177ac4b43f08b8c14a
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Mon Mar 11 21:27:52 2019 +0000
Bug 8995: (follow-up) Add tests, move open_url/coins routines to Koha namespace
Test plan:
1) Ensure the COinS span tag is still included on this pages. You need
to look into html source and search for span tag with class 'Z3988',
which has COinS string in title.
Staff client:
catalogue -> ISBDdetail
catalogue -> MARCdetail
catalogue -> detail
virtualshelves -> shelves
OPAC (you should have COinSinOPACResults system preference enabled):
opac detail
opac search
opac shelves
2) Run tests:
prove t/Biblio.t t/db_dependent/Biblio.t t/db_dependent/Koha/Biblio.t
Signed-off-by: Magnus Enger <magnus at libriotech.no>
Tested with all 9 current patches. Works as advertised, including
OPACURLOpenInNewWindow. If a record has no items, no OpenURL link
is displayed. All the suggested tests pass. I did not test with
XSLT turned off.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 29c687bff71c2530adeaaf2bdfbfa1ea565ba5e5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Sep 28 13:18:12 2016 +0100
Bug 8995: Add IGNORE to the INSERT statement
Signed-off-by: Magnus Enger <magnus at libriotech.no>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ffb432df7801498e2eefe9daaa19dbb563090716
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Wed Nov 6 16:04:42 2013 +0100
Bug 8995: Show OpenURL links in OPAC search results
This patch use GetCOinS sub to provide an OpenURL link in OPAC search
results. It uses 4 new system preferences:
- OpenURLinOPACResults: enable or disable this feature
- OpenURLResolverURL: url of the openURL resolver
- OpenURLText: text of the link
- OpenURLImageLocation: image of the link
Link is displayed as an image if OpenURLImageLocation is defined, and as
text otherwise.
It works both with and without XSLT enabled.
Changes made to GetCOinSBiblio:
For 'journal':
- Title should be in rft.jtitle instead of rft.title
- rft.date, rft.aulast, rft.aufirst, rft.au, rft.pub and rft.pages have
no meaning for a subscription, so they are simply removed from URL
This patch refactors GetCOinSBiblio, so the construction of URL is done
only at the end. This way we do not have ugly
$var .= "&$value"
in the function body.
Also use URI::Escape instead of custom regexps.
This development consider the value of syspref OPACURLOpenInNewWindow
when building the link.
Test plan:
1/ Enable syspref OPACShowOpenURL and put your OpenURL resolver URL in
OpenURLResolverURL syspref (if you don't have one, just fill it with
some fake URL, you'll have to check if OpenURL links are correct)
2/ If you want, set the other sysprefs OpenURLImageLocation and
OpenURLText
3/ Fill syspref OPACOpenURLItemTypes with some (not all) of your
item types.
4/ Empty sysprefs OPACXSLTDetailsDisplay and OPACXSLTResultsDisplay
5/ Go to OPAC and launch a search.
6/ Check you have in the results (near the title) the OpenURL link (only
for itemtypes that are in OPACOpenURLItemTypes).
Toggle OPACURLOpenInNewWindow syspref and check that the behaviour of
the link is correct.
7/ Go to the detail page of one of those and check you have the OpenURL
link too. (Above tags)
Toggle OPACURLOpenInNewWindow syspref and check that the behaviour of
the link is correct.
8/ Set sysprefs OPACXSLTDetailsDisplay and OPACXSLTResultsDisplay to
"default" and repeat steps 5 to 7
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Signed-off-by: Magnus Enger <magnus at libriotech.no>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit c5a98ed3e1dff26a6e0c1482663891694ec7cf98
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Apr 26 09:05:01 2019 +0000
Bug 8000: (QA follow-up) Two lastminute fixes
[1] Number of tests Letters.t
[2] Resolving uninitialized warn on Letters, L1327
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit f98037ac53f74a664f7ea1bdbe63d884fd5f4c6f
Author: Maryse Simard <maryse.simard at inlibro.com>
Date: Tue Feb 5 18:26:42 2019 -0500
Bug 8000: (QA follow-up) Add email validation to system preferences
This patch uses the JQuery validator plugin to add validation to preferences of class email in the system preferences page. A field containing an invalid value (even if not modified) should prevent saving.
To test, confirm that when entering an invalid email address in the SendAllEmailsTo field, an error message appears and saving is prevented.
Correcting the value should hide the message and let you save as normal.
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 26a61c97f07a5a7354e1ae123f43d4cf13fbc5fb
Author: Maryse Simard <maryse.simard at inlibro.com>
Date: Tue Feb 5 18:24:23 2019 -0500
Bug 8000: (QA follow-up) Update the to_address in the message queue
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit de47e59be5482d7d6e2611c3ceea0e42928404b2
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Mon Oct 29 21:35:00 2018 +0000
Bug 8000: (QA follow-up) Fix accidently edited sysprefs.sql file
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 968eea155e676ceaf89ad34a6cf9a90f6ae0e37d
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Oct 29 12:58:51 2018 +0000
Bug 8000: (QA follow-up) Centralise Bcc too
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit d51054c8b45a1c18a4e2bcf5272258a1ea523c8f
Author: David Bourgault <david.bourgault at inlibro.com>
Date: Fri Sep 15 15:06:13 2017 -0400
Bug 8000: Redirect all emails to SendAllEmailsTo
Rebased and squashed after changes to master.
Only difference from previous patches are small adjustements to conflicts in t/db_dependent/Letters.t
Test plan:
1) Apply path
2) Run updatedatabase.pl
3) Clear all SendAllEmailsTo system preference
4) Send mail to a patron of your choosing, email will go to patron's
email address as usual.
5) Set SendAllEmailsTo to a test email address
6) Send mail to the patron, email will be redirected to the email set
in the systempreference.
7) Run prove -v t/db_dependent/Letters.t
It does not affect messages in the message_queue.
This patch obsoletes previous patches, because it achieves the same
functionality in a much more centralized way. (4 lines of code!)
Signed-off-by: Ed Veal <eveal at mckinneytexas.org>
Signed-off-by: BWS Sandboxes <ByWaterSandboxes at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit e890cc42fda64b2bab3b0f26d66f5db60d2bdf4d
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Mon Apr 15 10:05:28 2019 +0000
Bug 20421: (follow-up) Fix styling
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit aa75553c3a84b89ac433aa3e1809b9855853f4bc
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Tue Mar 13 14:57:49 2018 +0000
Bug 20421: Inform staff that patron does have the title checked out during placing hold
Test plan:
1) Enable the CheckPrevCheckout and DisplayMultiPlaceHold system preferences
2) Have a patron with some checkouts history
3) Try to place hold on one of titles from history for this patron
4) You should see an information at the top of confirm request page, but
you still should be able to place a hold
5) Try this with multiple titles - one or more of them should be from
history
6) You should see this information in "Information" column
7) There is also new column placed at the beggining with checkbox, you
could uncheck it for titles you do not want to place a hold on it
8) Confirm the hold is placed only on checked titles
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Bin Wen <bin.wen at inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit e9f0212f352c01b83c1505226587b5e4da2a115b
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Wed Apr 24 23:56:30 2019 +0200
Bug 21502: (QA follow-up) Rephrase warning slightly
Test plan:
Follow first test plan, look at warning, decide if you like it :)
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7d4126e278b0b4949e89afdb683c091ed6c089f5
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Tue Apr 23 12:25:52 2019 +0000
Bug 21502: Add ItemsDeniedRenewal system preference to check syntax
Signed-off-by: Michal Denar <black23 at gmail.com>
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>
commit 81a614a0f5f79e7d54e0febf6d9ded0595a92977
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Fri Oct 5 13:48:07 2018 +0000
Bug 21502: Add UpdateItemLocationOnCheckin preference to YAML format check
Signed-off-by: Michal Denar <black23 at gmail.com>
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>
commit 40f6822dc1b6abc3e2c1b0a408db4d52d9c42eb5
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Fri Oct 5 13:43:54 2018 +0000
Bug 21502: Add check for YAML formatted system preferences to about page
So far there are these yaml formatted preferences:
UpdateNotForLoanStatusOnCheckin
OpacHiddenItems
BibtexExportAdditionalFields
RisExportAdditionalFields
UpdateItemWhenLostFromHoldList
MarcFieldsToOrder
MarcItemFieldsToOrder
Test plan:
1) Add some badly formatted YAML into some of preferences listed above
2) Check the System information tab on About page for appropriate warnings
Signed-off-by: Michal Denar <black23 at gmail.com>
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>
commit d559f93151ceaff3036d6f1fbe6666fb2075756f
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Tue Apr 23 11:46:24 2019 +0000
Bug 22757: Add CodeMirror highlighting on more YAML formatted preferences
Test plan:
Go to system preferences and ensure the code highlighting is used on
these preferences:
UpdateNotForLoanStatusOnCheckin
BibtexExportAdditionalFields
RisExportAdditionalFields
UpdateItemWhenLostFromHoldList
MarcFieldsToOrder
MarcItemFieldsToOrder
ItemsDeniedRenewal
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>
commit 99b2b2b6a70a6059ce862f3f89275c8dce99bd95
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Wed Apr 24 08:02:32 2019 +0000
Bug 21757: (follow-up) Fix number of columns in checkouts table footer template
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 9fff134de69e59c047f54c1536a69b759ee11ab8
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Thu Apr 18 08:37:38 2019 +0000
Bug 21757: (folow-up) Restore patron brief detail page
Test plan
1) Try to create patron with same name/datefobirth to trigger the
duplicate patron check
2) Click on "View existing record" link on "Duplicate patron record?"
alert message
3) You should see the patron data, but withou toolbar, menu, and so on.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit dd4877706a378ab939ba9c6094c6a949b112864e
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Fri Nov 2 17:40:45 2018 +0000
Bug 21757: Clenup of moremember.pl and its templates
This patch:
- removes unused templates
- use objects as much as possible
- remove many template params
Test plan:
1) Apply the patch
2) Play with patron detail page and try to broke it anyhow ;)
- messaging preferences
- enhanced attributes
- guarantors and guarantees
- fines
- messages
- checkouts
- overdues
- use different date formats, price formats and address formats
- ... there is many thinks you could try with this one page ;)
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit c5647b4f6275b987e0c73c638de2b1b4d3c26015
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Apr 29 11:55:58 2019 +0000
Bug 22772: Compiled CSS
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 64cc8f737b42870b26488c2f372c26cf298a15f1
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Apr 25 15:23:15 2019 +0000
Bug 22772: Menu link hover color incorrect in OPAC language choosers
This patch makes a few corrections to OPAC CSS to fix colors in the
language menus.
To test, apply the patch and rebuild the OPAC CSS.
- Enable multiple languages in the OPAC, including more than one
language "variation" (fr-FR, fr-CA).
- Set the OpacLangSelectorMode preference to "both."
- In the OPAC, test the language menu in both the header and footer.
When you hover over the sub-menu items the background should be green
and the text color white.
- Perform the same test in the self checkout and self checkin
interfaces.
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>
commit 3d022dc20ea34ba5fb2d37f7399b6d07be3cdea8
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Apr 26 13:55:31 2019 +0000
Bug 22537: Suspend all hold button appears even if the hold can no longer be suspended.
This patch adds to the user summary page in the OPAC a check for waiting
or in-transit holds. If all holds are waiting or in transit the "Suspend
all" controls will be hidden.
This patch also adds a missing $KohaDates filter to the "suspended
until" date.
To test, apply the patch and log in to the OPAC as a patron with holds.
Test these conditions:
- All holds are waiting and/or in transit
- The "Suspend holds" controls at the bottom of the page should not
appear.
- Some holds are waiting and/or in transit
- The "Suspend holds" controls should appear.
Signed-off-by: Marjorie <marjorie.barry-vila at collecto.ca>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Biblio.pm | 153 ----------------
C4/Letters.pm | 58 +++---
C4/XSLT.pm | 32 +++-
Koha.pm | 2 +-
Koha/Biblio.pm | 192 ++++++++++++++++++++
Koha/Email.pm | 10 +
about.pl | 26 +++
catalogue/ISBDdetail.pl | 2 +-
catalogue/MARCdetail.pl | 4 +-
catalogue/detail.pl | 4 +-
installer/data/mysql/sysprefs.sql | 6 +
installer/data/mysql/updatedatabase.pl | 27 +++
.../prog/en/includes/blocked-fines.inc | 4 +-
.../prog/en/includes/checkouts-table-footer.inc | 8 +-
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 10 +-
.../prog/en/modules/admin/preferences.tt | 1 +
.../en/modules/admin/preferences/acquisitions.pref | 2 +
.../prog/en/modules/admin/preferences/admin.pref | 5 +
.../en/modules/admin/preferences/cataloguing.pref | 2 +
.../en/modules/admin/preferences/circulation.pref | 3 +
.../prog/en/modules/admin/preferences/opac.pref | 29 +++
.../prog/en/modules/members/moremember-brief.tt | 92 +++++-----
.../prog/en/modules/members/moremember-receipt.tt | 78 --------
.../prog/en/modules/members/moremember.tt | 37 ++--
.../prog/en/modules/reserve/request.tt | 28 ++-
.../intranet-tmpl/prog/js/pages/preferences.js | 24 +++
koha-tmpl/opac-tmpl/bootstrap/css/opac.css | 2 +-
koha-tmpl/opac-tmpl/bootstrap/css/sco.css | 2 +-
koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss | 23 ++-
koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss | 4 +
.../bootstrap/en/includes/holds-table.inc | 44 +++--
.../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 49 +++++
.../bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 51 +++++-
.../bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl | 50 +++++
.../bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl | 49 +++++
members/moremember.pl | 173 +++---------------
opac/opac-detail.pl | 4 +-
opac/opac-search.pl | 16 +-
opac/opac-shelves.pl | 2 +-
reserve/request.pl | 18 +-
t/Biblio.t | 8 +-
t/db_dependent/Koha/Biblio.t | 42 ++++-
t/db_dependent/Letters.t | 13 +-
virtualshelves/shelves.pl | 2 +-
44 files changed, 848 insertions(+), 543 deletions(-)
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list