[koha-commits] main Koha release repository branch 3.20.x updated. v3.20.10-46-ga33d75c
Git repo owner
gitmaster at git.koha-community.org
Wed Apr 27 17:07:28 CEST 2016
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, 3.20.x has been updated
via a33d75c5b6090c6f42b5ef08baf435d44ae26a08 (commit)
via d1f8301ff8ab371f36cf75a07004dac159bc5961 (commit)
via 0bceb0af8111060fba607a6f15c3de707a879679 (commit)
via 62b3d204b2fa0e719ba6d9ecad1371d670aa5a1e (commit)
via 4a47224136df62b528f73d0e38c4febde903808a (commit)
via 68f551c37a96c8332cd47813a90e6cfb41202efc (commit)
via c5a4a4ad642153542b5168a5f4ede1c6d5c96b39 (commit)
via 029ccc0d512a767255807f21842262f8efcfcf17 (commit)
via 49e43878efa818fcf06b9f866102aa18c9a96e30 (commit)
via 551effddfb70f2785c694da978b65054feb86b1d (commit)
via fa07817592e7d00c40fb87cd6cb7c9b490273972 (commit)
via 06b7d7fa19726c0150c6544d8cd9bf7dee43fb46 (commit)
via 3c76bf5a76b55b362211839fa8c19f59fcc23049 (commit)
via d3faa9cc532630f7f2b0b2022579834d117ce5ed (commit)
via 2f59171ca92a21d0025701c5d8851fd6bcc08a6c (commit)
via 52f8818ac357b7172d382803b5015e0c36e35a05 (commit)
via 7eb3fc2738dcc02e48ed07305acd0a882a0699bd (commit)
via 67acc63bd139b5deae120f6536c0b3e3fa16f941 (commit)
via 37740c696e9161639d68752c61620f53c8c0fcbc (commit)
via c5fe537db93f71911a202ecbb9ec30436a8c1732 (commit)
via e7b1d92f41fb181e4e47c898c51f62c30af4f8f3 (commit)
via 9f1c5dc552095099632e140d9d50c995e9bf2505 (commit)
via 850f66a214c045af675dbd8887554ae78a2941f1 (commit)
via 551973022632d46f08687f281bffa340f2306b53 (commit)
via 19e2a1b343042f8d4438cec6b0485a913020df3a (commit)
via fbf7fb5da17ea0fd1f50892b51e6246d938223d9 (commit)
via 882e002165a10a24e83de4a9746d06a2ac74fa23 (commit)
via 8a77af1215516165fb44d5c0f04ae80d570c2216 (commit)
via b4846b121011f2d749cf645cdc631d651003022e (commit)
via fac50f8c1a5c1815e0bf5361486423fc95410d0d (commit)
via 9bf48192b74f3e5260d1422487551e3a32921898 (commit)
via 8fd14b9b6b6e41cd3242948ba3fa7b8d165af446 (commit)
via 430dc045033ea3f70684068da3d37f0b769b60f9 (commit)
via 0f5ef2cc8a31b7d520390e52d6b5a250071cde3c (commit)
via 90b4c1fe665fa251dd060a62dcc62af9f96da64a (commit)
via 2318d6175b27003866bdc412fca878806cc5c363 (commit)
via f74e6488f659374aa30553f1e0be6be6973f5143 (commit)
via ffab14e5f5297000465885cb9d7c5214c1d0891b (commit)
via 61b64efe02da4604f77f4703b9f00faac9497dcd (commit)
via 431a141b946412ebe13c0347660546106aad11c7 (commit)
via 9082762551429199eb911697ceb7d620436ef865 (commit)
via 79f813467c4b02106420951eafc692674745eea9 (commit)
via 90d46d133750d8b29afe8dbd91f30cc402b8cb7d (commit)
via 57b94630d1eb917f527ea09cf28ac8d880dcd9be (commit)
from 0ed4d365fa7bc235a4d5546ec77a578a5e20cc7a (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 a33d75c5b6090c6f42b5ef08baf435d44ae26a08
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Apr 6 11:33:11 2016 +0100
Bug 15930: Make patron searches defaulting on 'contain'
The default patron search types has changed from 'contain' to
start_with. Users consider it as a bug.
This patch revert the previous changes to default on 'contain'.
Test plan:
Search for patrons in different places (guarantor, checkout, patron
module, acquisition module, etc.) and confirm that the default is always
'contain'
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jesse Weaver <jweaver at bywatersolutions.com>
Signed-off-by: Brendan Gallagher <bredan at bywatersolutions.com>
(cherry picked from commit a8491dc156db9d746b0f5ddd6175b66bf1bfa4ab)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit f2c5b7b036a47289a069f89bf3e63ede548058d8)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit d1f8301ff8ab371f36cf75a07004dac159bc5961
Author: Mason James <mtj at kohaaloha.com>
Date: Fri Apr 1 15:23:22 2016 +1300
Bug 1750 - Report bor_issues_top erroneous and truncated results.
Signed-off-by: Mason James <mtj at kohaaloha.com>
TEST PLAN
---------
1) Ensure you have some checkouts
2) Home -> Reports
-> Patrons with the most checkouts
3) Click 'Submit'
-- you get a list
4) Click a patron name.
5) Note the borrower number.
6) In MySQL run something like:
> UPDATE borrower SET firstname=NULL WHERE borrowernumber=####
7) Refresh the report page
-- name goes totally blank
8) apply patch
9) Refresh the report page
-- only first name is lost
10) run koha qa test tools
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Brendan Gallagher <bredan at bywatersolutions.com>
(cherry picked from commit b859739c2a6dc899176276022782ac3af7a0ad0c)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 8f4df78bd46e9e9c02f2841ef6bd1bba2bb39c6c)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 0bceb0af8111060fba607a6f15c3de707a879679
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Apr 8 10:04:20 2016 +0100
Bug 16210: Set X-Frame-Options to SAMEORIGIN in 2 other places
The login page should not be displayed if the page is displayed in a
frame.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Brendan Gallagher <bredan at bywatersolutions.com>
(cherry picked from commit 6efa491d1b2f92fa407aa49c7b678f9b642fc83f)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 7729ace7fa6fae2aec48abe80ea36d4f81197cbe)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 62b3d204b2fa0e719ba6d9ecad1371d670aa5a1e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Apr 8 10:03:24 2016 +0100
Bug 16210: Revert OPAC changes from Bug 15111
This patch reverts the changes made at the OPAC from the following
patches:
Do not include the antiClickjack legacy browser trick for greybox"
Revert "Bug 15111: Do not include the antiClickjack legacy browser trick for greybox"
This reverts commit fc640d2a86f395ad392f84314bce22e8b4dab1fe.
Revert "Bug 15111: Change X-Frame-Options with SAMEORIGIN"
This reverts commit fb167c0e4b897bf9a93b4fd6176b15e2d4dbd4df.
Revert "Bug 15111 - Koha is vulnerable to Cross-Frame Scripting (XFS) attacks"
This reverts commit dc03bca76cf5b7cb48d98d1ce245fc65b98be929.
Setting X-Frame-Options to SAMEORIGIN is enough for mordern browsers:
https://developer.mozilla.org/en-US/docs/Web/HTTP/X-Frame-Options
The antiClickjack trick should be removed at the OPAC as we want to keep
the OPAC usable even if the user has disabled JS.
That means the OPAC will be vulnerable to XFS if a user is navigating
with a prehistoric browser:
Firefox 3.6.9 September 2010
IE 8 March 2008
Opera 10.5 March 2010
Safari 4 February 2009
Chrome 4.1.… somewhen 2010
Test plan:
Confirm that there are no regression of bug 15111 with modern browsers
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Brendan Gallagher <bredan at bywatersolutions.com>
(cherry picked from commit d496d03e8aa3079e0d29837b27b31b9a55afd02e)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 57fc49475db35b965ea50e5b60114fa46b2be37f)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 4a47224136df62b528f73d0e38c4febde903808a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Feb 22 09:24:29 2016 +0000
Bug 15111: Do not include the antiClickjack legacy browser trick for greybox
Most of the scripts called via greybox (which uses iframe) don't include
doc-head-close. But some do.
This patch adds a popup parameter for these templates, not to include
the legacy browser trick and avoid the replacement of the location.
Test plan:
1/ Export patroncard and label
2/ translate itemtypes
3/ click on a idref link at the OPAC
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit fc640d2a86f395ad392f84314bce22e8b4dab1fe)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 45e39882432dd9fdae0fc1b1ef7b7b8b09a9480a)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 68f551c37a96c8332cd47813a90e6cfb41202efc
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Nov 13 08:19:57 2015 +0000
Bug 15111: Change X-Frame-Options with SAMEORIGIN
There are some places where frames are used, the greybox JS plugin for
instance.
We need either to allow them from Koha or replace this plugin.
The easier for now is to switch the value from DENY with SAMEORIGIN.
Test plan:
- modify a record in a batch (tools/batch_record_modification.pl)
- click on preview marc
=> With only the previous patch you will get a blank page.
=> With this patch apply, it will work as expected.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit fb167c0e4b897bf9a93b4fd6176b15e2d4dbd4df)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 201e1f239728f3656f5f71792a7d5ce9b5a05144)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit c5a4a4ad642153542b5168a5f4ede1c6d5c96b39
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Nov 2 12:11:17 2015 -0500
Bug 15111 - Koha is vulnerable to Cross-Frame Scripting (XFS) attacks
Web pages that can be embedded in frames are vulnerable to cross-frame
scripting attacks. Cross-frame scripting is a type of phishing attack
that involves instructions to an unsuspecting user to follow a specific
link to update confidential information in an online application.
Because the link leads to a legitimate page from the online application
that is embedded in a frame hosted by the attackers' server, the
attackers can capture all the information that the user enters.
https://www.owasp.org/index.php/Clickjacking_Defense_Cheat_Sheet
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit dc03bca76cf5b7cb48d98d1ce245fc65b98be929)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit c97a01e1330ab5b1b1df7029d2149efa0deb19a4)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 029ccc0d512a767255807f21842262f8efcfcf17
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Apr 4 14:45:48 2016 +0100
Bug 16179: Do not crash if "rate me" is clicked and not rate selected
If JS is disabled and a user clicks on the "Rate me" button, Koha will
crashes with:
DBIx::Class::ResultSet::create(): Column 'rating_value' cannot be null
at /usr/share/koha/lib/C4/Ratings.pm line 208
To avoid that, opac-ratings.pl will check if a rate has been selected.
Test plan:
Disable JS
On a record detail page, click on the "Rate me" button
TESTED PLAN:
1) go to /cgi-bin/koha/opac-ratings.pl?biblionumber=1
-- kaboom as above.
2) apply patch
3) refresh
-- either login screen (don't know why)
-- or if already logged in, detail page.
4) koha qa test tool
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
I tested successfully by temporarily removing the modification made by
Bug 16210.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Brendan Gallagher <bredan at bywatersolutions.com>
(cherry picked from commit b679cac96409b7248f8e224e10c73dafa4c82890)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit a965702c08f84d8d770fb81e09f13bee8e922bba)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 49e43878efa818fcf06b9f866102aa18c9a96e30
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Apr 5 07:40:21 2016 +0100
Bug 15832: Remove empty string from the filters
On each cell, the split will generate a new empty entry.
This patch removes that entry.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Brendan Gallagher <bredan at bywatersolutions.com>
(cherry picked from commit 1931ff465317aa2bf8d31c0c817ff0c4d75ea8dc)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit ef6c60d8ccc93832f87f7b6fe1f3daa5ce48dda9)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 551effddfb70f2785c694da978b65054feb86b1d
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Tue Feb 16 16:33:17 2016 +0100
Bug 15832 - Fix filter and items split-up in pendingreserves.tt
Test plan:
- Go to circ/pendingreserves.pl (Ensure that there are biblios with many
items on different branches),
- Check the libraries filter at the bottom of datatable. There should be
duplicates.
- Apply this patch and return to circ/pendingreserves.pl,
- check that libraries filter should not contain duplicate,
- check that the filter works.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Brendan Gallagher <bredan at bywatersolutions.com>
(cherry picked from commit 82be93af1ccbd3544646a6345ab51183a62d05cb)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 4f699275a76107f3a210a199dc9cadd5da2560f3)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit fa07817592e7d00c40fb87cd6cb7c9b490273972
Author: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
Date: Fri Apr 1 15:30:26 2016 -0300
Bug 15113: koha-rebuild-zebra should check USE_INDEXER_DAEMON and skip if enabled
This patch changes the behaviour of the koha-rebuild-zebra script in the following way:
USE_INDEXER_DAEMON=no
- Keeps the current behaviour
USE_INDEXER_DAEMON=yes
- It skips incremental indexing to avoid races.
Caveats:
- A --force option is introduced for useing in a specific situtation that might need it
(i.e. the administrator knows what he's doing).
- If --full is passed, the reindexing is not skipped.
The documentation files and messages are adjusted accordingly.
This patch should help users that want to use the indexing daemon, in which case they wouldn't need
to change their default 5 min cronjob (it will be just skipped). Ultimately, koha-common could have
USE_INDEXER_DAEMON = yes by default, but that's subject for another bug report.
To test:
- Play with the different option switches and USE_INDEXER_DAEMON
- Things work as expected
- Sign off
Regards
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Works as expected
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Your Full Name <your_email>
(cherry picked from commit 997ad166c6ea53d47e3e15e7720d63da9f3b0a80)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 67dd96545bf8fdabdc98428438cbd92a5ae33c9f)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 06b7d7fa19726c0150c6544d8cd9bf7dee43fb46
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Thu Jan 7 15:38:57 2016 +0100
Bug 14816: Fix multiple selection in item search
Send each selected value as a separate parameter. Otherwise DataTables
(or jQuery ?) joins all values with a comma
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
I could not reproduce the bug when selecting multiple home libraries,
but I could by selecting multiple item types or collection codes. The
patch allowed those queries to complete correctly.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Brendan Gallagher <bredan at bywatersolutions.com>
(cherry picked from commit 9aa8bf46f6b45ebcd342c09bd3a09ae55f3dd4a8)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 47ebb4ffb1869b52f1c011e3a6b236b85b0e51ab)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 3c76bf5a76b55b362211839fa8c19f59fcc23049
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Feb 26 21:08:55 2016 +0000
Bug 15928 - Show unlinked guarantor
To test:
1 - Add guarantor data to patron account by typing it in but do not 'Set to patron'
2 - Note it is not displayed on patron details
3 - Apply patch
4 - Note the info is displayed
5 - Test that linked guarantors show as expected
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit bebb61739f4460295151a37d44cc1a2d6f956d26)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit d3faa9cc532630f7f2b0b2022579834d117ce5ed
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Thu Apr 14 14:29:38 2016 +0200
Bug 15962: Block the currency deletion if used
A currency should not be deleted if used by a vendor or a basket.
Test plan:
1/ Add a new currency
2/ Create a vendor using this currency
3/ Create a basket using this currency
4/ Try to delete the currency
5/ Delete the basket
6/ Try to delete the currency
7/ Delete the vendor
8/ Delete the currency
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit c20496aea938e1faaa53daff5e2cf3d697b0eac9)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 2f59171ca92a21d0025701c5d8851fd6bcc08a6c
Author: Marc Véron <veron at veron.ch>
Date: Wed Mar 23 08:11:49 2016 +0100
Bug 16133: Translatability of database administrator account warning
This patch removes sentence splitting of the database administrator warning with
a button styled link.
Additionally, it uses the same wording as in the warning on the 'About' page.
To test:
- Apply patch
- Log in to Staff client as database administration user
- Verify that the wording of the warning is the same as on the About page (Tab
'System information')
- Verify that the link to the patron administration page is styled as a button
and behaves correctly
NOTE: Actually, the category is irrelevant. But I like the improved message.
Categories may or may not be set up at the initial log in.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit e53b80dedf91617f9eecb9defd2d6f5222f03d65)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit c6a049167f9f1b4d4df81520900b23d2b9e0ea46)
commit 52f8818ac357b7172d382803b5015e0c36e35a05
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Fri Apr 1 17:59:29 2016 -0400
Bug 16191: t/Ris.t is noisy
TEST PLAN
---------
1) prove t/Ris.t
-- very noisy
2) apply patch
3) prove t/Ris.t
-- just one confusing noise.
4) run koha qa test tools
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com
(cherry picked from commit 5b909a82693d452d233e95d7598092aa5ee14c17)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit af42fd5e81c7ce2764dc9796293e9815f9809b54)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 7eb3fc2738dcc02e48ed07305acd0a882a0699bd
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Mar 17 09:08:39 2016 -0400
Bug 16047 [Follow-up] Software error on deleting a group with no category code
This follow-up take the original patch a little further, making category
name required on the entry form as well. Without a category name there
is no label in the interface when selecting a category. That doens't
make any sense.
Also changed on the group entry form:
- Added "required" attribute to labels on required fields.
- Changed "Update" submit button label to "Submit."
- Added a "Cancel" link.
- Added the "validated" class to the form so that our built-in
validation script will process it (not strictly necessary but makes
the validation appearance more consistent).
Followed test plan, form displays and behaves as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com
(cherry picked from commit df127ebad814ad1710b161b85a69d408de95de85)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit c514e1fee2890660caa36c1dae62bcfbc6f72fc3)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 67acc63bd139b5deae120f6536c0b3e3fa16f941
Author: Aleisha <aleishaamohia at hotmail.com>
Date: Thu Mar 10 21:49:57 2016 +0000
Bug 16047: Making category code a required field on creating a group
This will prevent users from creating a group without a category code,
which causes a software error when you try to delete it
To test:
1) Go to Admin -> Libraries and groups
2) Create new group without category code
3) Attempt to delete the group you just created and notice software
error
4) Apply patch
5) Create new group without category code
6) Notice you now cannot save the group without putting in a category
code
Sponsored-by: Catalyst IT
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com
(cherry picked from commit 577aa86eb96160088c70008bfe85ae2c0820f547)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 730cfb59258841572d19ffd9eedf36571edc100a)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 37740c696e9161639d68752c61620f53c8c0fcbc
Author: Aleisha <aleishaamohia at hotmail.com>
Date: Sun Mar 13 23:40:53 2016 +0000
Bug 16029: Hide patron toolbar if patron does not exist
To test:
1) Create a patron, take note of the borrower number
2) Delete the patron
3) Navigate to the page of the patron you just deleted by typing the url (ie /cgi-bin/koha/members/moremember.pl?borrowernumber=X)
4) Confirm that the patron toolbar is not showing on the page
5) The message now has a link that says 'Find another patron?'. Click this link and confirm you are taken to the member home pgae.
Sponsored-by: Catalyst IT
Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com
(cherry picked from commit 1870141874667d854f9b5508c563169baefb2328)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit e0ad205512af9dba2a9d5cad70bf6fdffecc6e17)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit c5fe537db93f71911a202ecbb9ec30436a8c1732
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Mar 18 09:41:15 2016 -0400
Bug 15984 - Correct templates which use the phrase "issuing rules"
This patch corrects two places in the templates where the phrase
"issuing rules" is used instead of "circulation and fine rules."
To test, apply the patch and view the help pages for Administration ->
Circulation and fine rules; and Tools -> Automatic item modification by
age. Confirm that the term "circulation and fine rules" is used instead
of "issuing rules."
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com
(cherry picked from commit 98a9e30f040661e0a67a594f72abd8ab02cf9ad6)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 1c1d9558eb6df6f44e96d204e8e6683e3ae04491)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit e7b1d92f41fb181e4e47c898c51f62c30af4f8f3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Feb 12 11:49:28 2016 +0000
Bug 14076: Do not use CGI->param in list context - opac-authorities-home.pl
See bug 15809 for more info on why we should not use CGI->param in list
context.
Note: I have not found any places where several values for the same
params are passed to this script but, just in case, this patch won't
change this ability.
Test plan:
Do an authority search at the OPAC
Test with several values of the form.
Confirm that the results are always the same before and after this
patch.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com
(cherry picked from commit 3fa2b10150a9ea2db2897be1246cba3785c55e55)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 182838a54498b4a00a4077779458cf005f5ec444)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 9f1c5dc552095099632e140d9d50c995e9bf2505
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Feb 12 11:32:02 2016 +0000
Bug 15809: Redefine multi_param is CGI < 4.08 is used
On debian Jessie, the CGI version is >= 4.08
Since this version, the param method raise a warning
"CGI::param called in list context".
Indeed, it can cause vulnerability if called in list context
https://metacpan.org/pod/CGI#Fetching-the-value-or-values-of-a-single-named-parameter
http://blog.gerv.net/2014/10/new-class-of-vulnerability-in-perl-web-applications/
There is a long journey to get rid of these warnings.
First I suggest to redefine the multi_param method when the CGI version
installed is < 4.08, it will allow us to move the wrong ->param calls to
->multi_param without waiting for everybody to upgrade.
The different ways to call these 2 methods are:
my $foo = $cgi->param('foo'); # OK
my @foo = $cgi->param('foo'); # NOK, will raise the warning
my @foo = $cgi->multi_param('foo'); #OK
$template->param( foo => $cgi->param('foo') ); # NOK, will raise the warning
# and vulnerable
$template->param( foo => scalar $cgi->param('foo') ); # OK
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Tested a call to multi_param with CGI < 4.08.
With reference to the comments on Bugzilla, this workaround is arguable,
but provides a base to move to multi_param. If we come up with a better
solution, it should be easy to adjust.
Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com
(cherry picked from commit 94dde6b48d6e20a5260ea49f9b98ec884c2c25b5)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 279732365eb07bf9f9929402aadd837c16f131b6)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 850f66a214c045af675dbd8887554ae78a2941f1
Author: Mason James <mtj at kohaaloha.com>
Date: Fri Apr 1 15:56:34 2016 +1300
Bug 16184 - Report bor_issues_top shows incorrect number of rows
TEST PLAN
---------
1) Have at least 6 patrons with checkouts and some checkins.
2) Reports -> Patrons with the most checkouts
3) Click 'Submit' (default is 5)
-- more than 5 entries listed.
4) Apply patch
5) Refresh page
-- only 5 entries listed.
6) Run koha qa test tools
NOTE: While this works, I'd be much happier with a refactor
as it would also speed up the report. See comment #5.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 2c68980467009a9d19116440d4f28356707e9e7c)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit bd4659d09f92135a7956496c44af555b5938c8c3)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 551973022632d46f08687f281bffa340f2306b53
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Wed Mar 30 16:49:10 2016 +0200
Bug 16171 - Show many media in html5media tabs
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit c2f92f68d84753d62880e17e9d1bd19c8b9bff47)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 0c37ebee17b81f31838c28f0690cea07b314a893)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 19e2a1b343042f8d4438cec6b0485a913020df3a
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Feb 23 20:41:57 2016 +0000
Bug 15888 - Syndetics Reviews preference should not enable LibraryThing reviews
To test:
1 - Enable Syndetics Reviews without a LibraryThing ID
2 - Check page source and note you have a stanza for LTFL tabbed reveiws
3 - Apply patch
4 - Reload page and note LTFL tabbed reviews are not present
5 - Enter a LibraryThing ID and not the tab is restored.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 541a03cf6daace451f78e614b8019382dcd52acc)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 9a7c37473042cbc0c533ea12e95273b7471d22a3)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit fbf7fb5da17ea0fd1f50892b51e6246d938223d9
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Thu Apr 7 07:43:21 2016 +0200
Bug 15868: Ask for confirmation when deleting a MMT action
Test plan:
Create marc modification template
Add an action
Delete it
With this patch you must get a confirmation mesg
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 9fddbc045da2dc25389e924262bd8f6e2bc99bfd)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 882e002165a10a24e83de4a9746d06a2ac74fa23
Author: Aleisha <aleishaamohia at hotmail.com>
Date: Sun Mar 20 23:24:18 2016 +0000
Bug 15866: Add confirm message for deleting rotating collection from toolbar
To test:
1) Go to Tools -> Rotating Collections
2) Click on any rotating collection ('Add or remove items' from drop down menu)
3) Click 'Delete' from toolbar. Validate you are now asked to confirm your deletion. Check that cancel works, then check that confirm works.
Sponsored-by: Catalyst IT
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
I've added the word 'rotating' before collection, to make
it clear for translators what is meant here.
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit a48d166bbf506287355c9fceea2633159308c530)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 887bb8c92fbda53713dd0862124b533ce64ece1f)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 8a77af1215516165fb44d5c0f04ae80d570c2216
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Wed Feb 17 12:27:14 2016 +0100
Bug 15838 - Subscription duplicating: Reset fields from SubscriptionDuplicateDroppedInput syspef by getting them using name instead of id
How I tested:
Verified bug with start and end date (were not cleared without patch).
After applying the patch all fields defined in SubscriptionDuplicateDroppedInput
were cleared as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com
(cherry picked from commit 873a49f13b79bf1f5f7163f217cfc3a317ce602f)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 702002129787ceb2cdae61f6dc2352dff1afa84d)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit b4846b121011f2d749cf645cdc631d651003022e
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Wed Apr 6 16:12:16 2016 +0200
Bug 16214: Fix typo 'To.jon' -> 'To.json'
Bug 15722 introduces a regression in serials patron search results,
causing the surname to not be displayed
To reproduce:
1. Create a routing list for a subscription
2. Click on "Add recipients" button
3. Run a search
4. Check that surname is not displayed
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit e916ded09756ba4902a25e9e68fe536614419c87)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 11ba21369dc99ba2b1ae4d4fbe4af572e6af40e4)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit fac50f8c1a5c1815e0bf5361486423fc95410d0d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Mar 8 14:09:09 2016 +0000
Bug 15722: Escape patron infos for JSON in patron searches
If patron infos contain invalid JSON chars (\t for instance), the
results won't appear.
The solution is to escape these info.
Test plan:
Edit patron infos in DB (update borrowers set surname="foobar\t" where
borrowernumber=42)
Search for foobar (you should have more than 1 result)
Without this patch, DT retrieves a bad formatted JSON and the results
won't appear.
With this patch, the table result appears
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit cd20b61a7c845110e518e6dedc12ac50efebe4aa)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit eba74c8e51a52432362150c38d674f661a6228e8)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 9bf48192b74f3e5260d1422487551e3a32921898
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Feb 9 17:02:05 2016 +0000
Bug 15773: Fix and standardise checkboxes code in framework
When creating a new subfield for an authority framework, the checkboxes
don't behave as they should.
If you click on the 'repeatable', 'mandatory' or 'is url' checkbox's
label, the checkbox from the second tab will be checked/unchecked.
This is caused by a non-unique id of the input element.
I have found this bug when working on the removal of CGI::checkbox in
both admin/auth_subfields_structure.pl and
admin/marc_subfields_structure.pl scripts.
This patch remove the use of CGI::checkbox as well as the generation of
html code from these 2 pl scripts (which should be avoided).
The code these scripts are now pretty similar.
Test plan:
Add/modify/remove subfield for a MARC framework and an Authority
framework.
Use as many field as possible and confirm that the values are correctly
inserted/displayed.
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Works as advertised
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com
(cherry picked from commit 39597b86ae299a9b4c0c1e8221f51f9e8dd300ed)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 60e601bf5f485a46b36bf14d2145adf9c25fe098)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 8fd14b9b6b6e41cd3242948ba3fa7b8d165af446
Author: David Cook <dcook at prosentient.com.au>
Date: Fri Feb 5 16:09:45 2016 +1100
Bug 15745: C4::Matcher gets CCL parsing error if term contains ? (question mark)
Signed-off-by: Olli-Antti Kivilahti <olli-antti.kivilahti at jns.fi>
Also fixes ! and +
Rebased to master
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
It makes perfect sense and works as expected. This part of the code is too
under-tested so no point requiring a regression test for such a simple change.
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit fcbd81049f590e5fc0c31030bcdb1311951c1444)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 7212c9f41e635a3be54dc2356696b1e9ce6a370f)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 430dc045033ea3f70684068da3d37f0b769b60f9
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Mar 8 11:58:24 2016 +0000
Bug 15741: Fix rounding in total fines calculations
C4::Members::GetMemberAccountRecords wrongly casts float to integer
It's common to use sprintf in Perl to do this job.
% perl -e 'print int(1000*64.60)."\n"';
64599
% perl -e 'print sprintf("%.0f", 1000*64.60)."\n"';
64600
Test plan:
1) Create manual invoice for 64.60 (or 1.14, 1.36, ...)
2) Try to pay it using "Pay amount" or "Pay selected" buttons
Signed-off-by: Sally Healey <sally.healey at cheshiresharedservices.gov.uk>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 92fbb1f3d0f2bdb070a1b647c96edbce5b28a377)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 40507ce1529a237ec5c51837805100e89e96db9c)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 0f5ef2cc8a31b7d520390e52d6b5a250071cde3c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Mar 30 11:30:01 2016 +0100
Bug 15323: Use fixtures for the active currency
prove t/Prices.t
fails after bug 15084 has been pushed
It's caused by
commit 1538e9ecf47642c4974693ff499c3e95e4d71977
Bug 15084: Replace C4::Budgets::GetCurrencies with
Koha::Acquisition::Currencies->search
Koha::Number::Price->_format_params calls
Koha::Acquisition::Currencies->get_active, which requests the DB.
The currency data should be mocked.
Test plan:
sudo service mysql stop
prove t/Prices.t
should return green
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
Patch works as expected and passes the qa-tools tests.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 0a14e22d59343475ed6970b82b474a80e43d8e29)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit c4c7ea475b813d97595a6114ef2e31028ec6efe5)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 90b4c1fe665fa251dd060a62dcc62af9f96da64a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Mar 1 12:13:22 2016 +0000
Bug 14441: TrackClicks cuts off/breaks URLs (XSLT)
Same test plan as previous patch, but for opac defail and result using
the XSLT views.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
I am amazed!
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit ee0abde76e78713233a9fcd31fbb6f80b5a9610c)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 97de8be7046833a3a1e6ced3e3d512c89ca8cb85)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 2318d6175b27003866bdc412fca878806cc5c363
Author: Mason James <mtj at kohaaloha.com>
Date: Tue Mar 1 16:26:06 2016 +1300
Bug 14441 - TrackClicks cuts off/breaks URLs
to test...
1/ set TrackClicks syspref to 'track'
2/ add a problematic multipart url to an item's 'url' field
example url: http://foo.corg?key1=val1&key2=val2
3/ test url in opac-detail.pl - url is corrupt
4/ apply patch - url is corrct
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Only fixes the item URLs - a follow-up for the URLs
in the bibliographic record (856 for MARC21) is still
needed.
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit de2a298a0623408c064ed0edbe47795740c814f4)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 7e7b170febb55dfdc01d1864eaa48a1646210cc0)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit f74e6488f659374aa30553f1e0be6be6973f5143
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Mar 30 10:55:02 2016 +0100
Bug 14158: www search tests - Cleanup at the end
When something wrong happen, the parent process is waiting for the
children to finish, but they have been zombified and the test hangs.
To fix that, we should ensure that the cleanup is correctly done and
that the processes are correctly killed.
Test plan:
export KOHA_USER=koha
export KOHA_PASS=koha
export KOHA_INTRANET_URL=http://do_not_exist_but_its_expected
export KOHA_OPAC_URL=http://another_url
prove t/db_dependent/www/search_utf8.t
Without this patch, the tests will hang
With the patch applied, they won't!
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 8255a18edc9c2eee52b01bfa20114b088b9bf555)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 5808b3de5b40bf964813b0c3509f7f7cd0429422)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit ffab14e5f5297000465885cb9d7c5214c1d0891b
Author: Marc Véron <veron at veron.ch>
Date: Wed Feb 10 17:21:40 2016 +0100
Bug 11498 - Prevent bypassing sco timeout with print dialog
This patch prevents bypassing the self check timeout with the print dialog.
To test:
- Set syspref 'WebVasedSelfCheck' to 'Enable'
- Set syspref 'SelfCheckoutReceivePrompt' to 'Show'
- Set syspref 'SelfCheckTimeout' to 20 seconds
- Apply patch
- Go to SCO page (/cgi-bin/koha/sco/sco-main.pl)
- Enter card number
- Click 'Finish'. Dialog "Would you like to pritn a receipt?' appears.
- Confirm printing without waiting 20 seconds
=> Result: Print slip, SCO page shows 'Please enter your card number'
- Enter card number again
- Click 'Finish'. Dialog "Would you like to pritn a receipt?' appears.
- Wait > 20 seconds (value of SelfCheckTimeout) and then confirm.
=> Result: Message appears "Timeout while waiting for print confirmation"
- Click on OK.
=> Result: Self checkout page refreshes (shows 'Please enter your card number')
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
https://bugs.koha-community.org/show_bug.cgi?id=11497
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 7f8037f642913d94ebec70413c6fd8cadfdf938d)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 80737996ec728d0cb6264f35a2a98a6f33ee445f)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 61b64efe02da4604f77f4703b9f00faac9497dcd
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Mar 3 08:58:06 2016 +0000
Bug 15967: Fix regression from bug 14133 - notify the library if patron is not
Regression introduced by bug 14133, see but 14133 comment 13.
Test plan:
Without this patch applied, if a patron cannot be notified (no email
address or sms number), the print notice generated for the library was
not.
With this patch applied, the print notice should be generated using the
print template
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit faaa2cbcdb1970866be4f8a7001bf2de305823a9)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 8664af5e20716d1a849b1deb26e48927b4921c5a)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 431a141b946412ebe13c0347660546106aad11c7
Author: John Seymour <John.Seymour at nal.gov.au>
Date: Wed Feb 10 22:38:15 2016 -0500
Bug 14633: Patch to control.ini to add or dependency to libapache2-mpm-itk
The other attachment was not a patch which could be applied by
'git bz'. This corrects that.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
debian/update-control will need to be run after this is applied, but
it works well
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit aa66debec6fcdbdadd643386749a61229167aa62)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 50c84aa4ce4614655a0fdc5c75a0e98694b4fa9c)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 9082762551429199eb911697ceb7d620436ef865
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Mar 21 15:49:25 2016 +0000
Bug 16040: Update fnReloadAjax DT plugin to fix quotes deletion
When deleting quotes, the table is not regenerated and a JS error is
raised.
That is because we are not using an up-to-date plugin
Test plan:
Delete a quote and confirm you do not get a JS error
Works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 908a751e2cadcda0ceafa2efdd2cf0104a323467)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 9478a0bf1eb43e0b82fb7c8ea84a4b503b9f81ce)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 79f813467c4b02106420951eafc692674745eea9
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Feb 1 13:48:06 2016 +0100
Bug 15713: Restart zebra when rotating logfiles
Somehow, it may happen that Zebra keeps writing to the old rotated logfile
with extension .log.1. I must add that although I saw that happen (a new
log was created and was empty, while Zebra kept writing to log.1 for weeks),
I cannot reproduce it every time.
By stopping the zebra server in prerotate and starting it again in
postrotate, this should not happen at all. In practice, this implies that
your Zebra server is restarted once a week.
Note: The existing sharedscripts directive makes sure that these actions
are not executed for all individual logfiles but once for all matching
logfiles (even when running multiple instances).
Test plan:
[1] Apply the change in koha-common.logrotate to the file
/etc/logrotate.d/koha-common.
[2] Run logrotate -f /etc/logrotate.conf (forcing a logrotate).
[3] Check in zebra-error.log that your zebra server was stopped
('killed by signal 15').
[4] Verify that your Zebra server runs (read: has been restarted).
(Do a search..)
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com
(cherry picked from commit af47f00636848e1115b08652abcaec6b789bf672)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit ddd1bbebeadc3bed0fd592bc04621a0dc3fb08c6)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 90d46d133750d8b29afe8dbd91f30cc402b8cb7d
Author: Marc Véron <veron at veron.ch>
Date: Thu Mar 24 11:59:27 2016 +0100
Bug 14614: Multiple URLs (856) in cart/list email are broken
To reproduce:
- Add multiple subfields 856 u to a bilbio
- Add this biblio to a cart and send it as mail
(from Staff client and from OPAC)
Result: Links in mail body are broken
To test
- Apply patch
- Send carts again (from Staff client and from OPAC)
- Result: In mail body, links display separated with blank-pipe-blank
like http://bla.com | http://blabla.com | http://blablabla.com
- Change one of the 856 u to not to be a link, e.g. äöü
- Send carts again
- Verify that in mail body äöü correctly display as text.
(Amended to make it work for OPAC as well, MV)
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit d135499d2893fe1000c627f433395989d7d9e022)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit bd6e5a4c32496c94b0f90010fdc6b8dc047ea64f)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 57b94630d1eb917f527ea09cf28ac8d880dcd9be
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Wed Mar 23 14:16:18 2016 +0100
Change syspref case to make tests pass
Regression due to bug 11998
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit f89c350f7216619bbf327bc700b0c4cd8be0486f)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 16 +-
C4/Context.pm | 9 +
C4/Matcher.pm | 5 +-
C4/Members.pm | 2 +-
C4/Output.pm | 11 +-
C4/Ris.pm | 11 +-
C4/Utils/DataTables/Members.pm | 2 +-
admin/auth_subfields_structure.pl | 180 ++++-----------
admin/currency.pl | 18 +-
admin/marc_subfields_structure.pl | 183 +++++----------
debian/control.in | 4 +-
debian/docs/koha-rebuild-zebra.xml | 12 +-
debian/koha-common.logrotate | 4 +
debian/scripts/koha-rebuild-zebra | 34 ++-
.../lib/jquery/plugins/dataTables.fnReloadAjax.js | 150 +++++++++----
.../prog/en/includes/doc-head-close.inc | 14 ++
.../prog/en/includes/patron-search.inc | 8 +-
.../en/includes/rotating-collections-toolbar.inc | 18 +-
.../en/modules/acqui/tables/members_results.tt | 2 +-
.../en/modules/admin/auth_subfields_structure.tt | 99 +++++---
.../prog/en/modules/admin/branches.tt | 17 +-
.../prog/en/modules/admin/currency.tt | 11 +-
.../prog/en/modules/admin/localization.tt | 237 ++++++++++++++++++++
.../en/modules/admin/marc_subfields_structure.tt | 74 +++---
.../prog/en/modules/basket/sendbasket.tt | 2 +-
.../prog/en/modules/catalogue/detail.tt | 12 +-
.../prog/en/modules/catalogue/itemsearch.tt | 7 +-
.../prog/en/modules/circ/pendingreserves.tt | 9 +-
.../prog/en/modules/help/admin/smart-rules.tt | 2 +-
.../intranet-tmpl/prog/en/modules/intranet-main.tt | 5 +-
.../prog/en/modules/labels/label-print.tt | 4 +-
.../prog/en/modules/members/member.tt | 7 +-
.../prog/en/modules/members/moremember.tt | 7 +-
.../en/modules/members/tables/members_results.tt | 2 +-
.../prog/en/modules/patroncards/print.tt | 2 +-
.../modules/patroncards/tables/members_results.tt | 2 +-
.../prog/en/modules/serials/subscription-add.tt | 2 +-
.../en/modules/serials/tables/members_results.tt | 2 +-
.../modules/tools/marc_modification_templates.tt | 9 +-
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 42 ++--
.../bootstrap/en/modules/opac-sendbasket.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 7 +-
.../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 5 +-
.../bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 9 +-
.../bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl | 5 +-
.../bootstrap/en/xslt/NORMARCslim2OPACResults.xsl | 5 +-
members/member.pl | 2 +-
members/moremember.pl | 5 +
misc/cronjobs/overdue_notices.pl | 12 +-
opac/opac-authorities-home.pl | 11 +-
opac/opac-ratings.pl | 7 +
reports/bor_issues_top.pl | 8 +-
t/Prices.t | 20 +-
t/db_dependent/Auth_with_cas.t | 2 +-
t/db_dependent/www/search_utf8.t | 5 +
55 files changed, 831 insertions(+), 511 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list