[koha-commits] main Koha release repository branch 3.20.x updated. v3.20.08-56-g9ac2678
Git repo owner
gitmaster at git.koha-community.org
Thu Feb 11 20:23:04 CET 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 9ac267821e2a174de6ee8747ad9437e40345d3a1 (commit)
via 9f190804f6479f3a7c8aebf16cd248f6ac5b6a5e (commit)
via e68c77995306d3c53edfae120336e91d036c1dec (commit)
via d3324e3f2505ef355cd4b20ad90acd1fe3f1219b (commit)
via 67d6b2fb2286ca7f7ed53ca1c4f64c03bf2af7dc (commit)
via 9fba5a9f0c7f4d8d144f38ae4cf6b6f5764d42ed (commit)
via 38dc5c75c48254c79277424e789e36e58e92dc36 (commit)
via 70f5762fb6cd0a89e996496a9a7d2b4f176b805f (commit)
via b5cca12611e368463da1f58c13cf800e01eb63a3 (commit)
via fffe15f7954476aacd8c951b662b82f9c3191102 (commit)
via 856a2bd1a11200a0d03eb87cb55f279465917f9d (commit)
via 600b83a136b02d664f4c27dcc9b358e19724f44f (commit)
via 6a03a328987e54fe817e2e62bbfcbbd8d1d9becf (commit)
via 2b19f959ce0c99b563f3adab12513f075fb62b47 (commit)
via 5f51b6f9708acb8ff0a2dbc323621e383a4100b5 (commit)
via 231f6d9ebe6cfc72f30d6f5460ffddfe7ca94713 (commit)
via 03efedc3e9f8e718642840fae23d864ecaca2f7a (commit)
via 4c8945df2386c0e37ba85e41735624307d63cb62 (commit)
via c0d4938a76ce0af04807762e9fd40db53a635f87 (commit)
via edf5844893500b6e624d291e7e339838afbf38c6 (commit)
via 88d4d49b11b43fcc1de49a7c0f7027bf81de5e6f (commit)
via 258cb5aaef8dd94e92784c1a0c5de65bb0fab431 (commit)
via 5a0dc0c2a49fcb960548fe90f0e97b6a8c12a1ff (commit)
via 66e9870a3e50cd937cab93fc23085e372e66cf3e (commit)
via 4ccc3451101d6a8341c355bdf0e4129003d98a29 (commit)
via 31a50f6eb76d0ba736e18c7133c2de513a505f3c (commit)
via a51ef6e248cabe3ca81c978eee8c2f39b09afa39 (commit)
via 85df13877290e4c0a4b659aadbcb2865c7058241 (commit)
via 14d59c88699dcd369624f65268184aa27807da0d (commit)
via 44a331a2b420ec5345274589c76347b225f0b2d3 (commit)
via cacbfbf834ffbba85a6778eb311e839aa886913f (commit)
via 8e554c858137c5a16d52fc96e24128e45d56a416 (commit)
via fa83ce9b6ed410cd99d51c35b29262e41ad19a4b (commit)
via e56a39f657dfde13b5e73598dcba38a90e584606 (commit)
via 822cb5158696d0f35222c9899ce031a2ac310122 (commit)
via 05ef470ecbd2eaccf1577f07ed9e5f750fcd931a (commit)
via dead28ef19bffe1e3fa8dd8abb5cea4a6e3ed091 (commit)
via 1692d597e29a9b53c4979b2eb48e18f31c01c6e5 (commit)
via c5c3d47621cfb39df13fc7e4227fda056813e379 (commit)
via c5cb615f9ce18b650a270e444dbc6868aa09fa0d (commit)
via 11796d60fa3167bd8b715a2289f90272e65af360 (commit)
via 87388b7d3ac56b609e43c1600564d998693b6c3e (commit)
via 60e9074bec01d4e16502bb0f9535ba8d11dcf391 (commit)
via 7d81810d148dccded70c3cd3ab0a5b7cfd1c2d74 (commit)
via 153877f10fd615213fb22f850965ca374b8c02c8 (commit)
via 7ab00713f020761fe40abce1f5f4ba55f613437c (commit)
via 4ebed3e6364a460b84073ecc3d8f3cbe4b75ab76 (commit)
via 9e456ee006a457bd5afc5859bfff269e97677abb (commit)
via 56242f3452984be7f92cbc598007e39757d25c24 (commit)
via 5ffe29c646e73b5cf594ac3062e2a018647315b2 (commit)
via 61c4621217f39fff2e2d91753a028f38c6ece71e (commit)
via c3ed8d41526221acc233182a85d66973078e8220 (commit)
via cf83f047cad2ac5dd19e7d4f198700c5f0e98a28 (commit)
via e6282f66cacfd04e7fe9280b118d28f0c824007f (commit)
via f44d4ba891775670d51f034603db7aa702c65f9b (commit)
via af677b11d18a04f284dd1e908f0cf2e0486104df (commit)
from da58b67a1a60dd462d2d70f96e3af3f43223058c (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 9ac267821e2a174de6ee8747ad9437e40345d3a1
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Jan 19 19:03:53 2016 +0000
Bug 15298 [QA Followup] - Fix whitespace issues
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit f98225c7c231926332bba9ec40de786aa58174d6)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit be7ca57e113d7ba27b86e93ad3ce05e64921b5db)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 9f190804f6479f3a7c8aebf16cd248f6ac5b6a5e
Author: Chloe <chloealabaster at gmail.com>
Date: Tue Jan 19 01:34:14 2016 +0000
Bug 15298 - z39.50 admin setup, options column suggested changes
To Test-
1-first look at the orginal Z39.50/SRU servers administration page
(/cgi-bin/koha/admin/z3950servers.pl?op=delete_confirmed&id=6)
2-apply patch
3-now see the new styling of the "action" drop down tab like the one on
the saved reports page
4-check that each link works (for delete i reccommend copying one then
deleting the copy)
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 142c47fcf4ca966f153d7d60e2f448cb2f5c929d)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 76326a09818cd6af8a07f427e56b17ff4c9220d5)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit e68c77995306d3c53edfae120336e91d036c1dec
Author: Marc Véron <veron at veron.ch>
Date: Tue Jan 5 15:57:07 2016 +0100
Bug 15472: Do not display links to circulation.pl if remaining_permissions is not set
If permission 'circulate_remaining_permissions' is not set, links to 'Circulation'
(/circ/circulation-home.pl) on the intranet home page lead to an error
message: "Error: You do not have permission to access this page."
This patch hides the links if the permission is not set.
To test:
- Apply patch
- Log in to the intranet (staff client) with a patron who has the permission
'circulate_remaining_pernissions' not set
- Verify that no links to Circulation appear on the intranet start page
(menu top left and menu in main page area)
- Log in as a user who has the permission set.
- Verify that te links appear as appropriate.
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Works as advertised
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 83936a6b821fe623a6bb7121d128a90107bf703c)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit daaf3c758c9ba6e642083f4e198b8ad451444c3f)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit d3324e3f2505ef355cd4b20ad90acd1fe3f1219b
Author: Hector Castro <hector.hecaxmmx at gmail.com>
Date: Tue Jan 19 15:10:03 2016 -0600
Bug 15598: Also fixing space near exclamation mark in other files
To test:
-Check that the space near to exclamation mark (!) is fixed
Signed-off-by: Briana <brianagreally at gmail.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 d3b7ccc87e2da4666617122f05ece2250a7c1500)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 7db70b33a4dedd6d1de321a49f4e4be33fd17293)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 67d6b2fb2286ca7f7ed53ca1c4f64c03bf2af7dc
Author: Hector Castro <hector.hecaxmmx at gmail.com>
Date: Tue Jan 19 14:40:02 2016 -0600
Bug 15597: Typo in opac-auth-detail.tt
Patch fix a small type
To test:
- Verify that a double punctuation mark colon (:) is fix it.
Signed-off-by: Briana <brianagreally at gmail.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 386aafd8bda94581c4eaa070552bf9a025306ceb)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 6cb7dc0c0a06839892bcba9172a1603793481f90)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 9fba5a9f0c7f4d8d144f38ae4cf6b6f5764d42ed
Author: Aleisha <aleishaamohia at hotmail.com>
Date: Mon Jan 18 20:09:37 2016 +0000
Bug 15589: Changing 'his' to 'their' in OPAC lists
To be more gender neutral
To test:
1) Go to OPAC lists (opac-shelves.pl)
2) Confirm it now says "Allow anyone to remove their own contributed
entries."
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 A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 229cc7e8be66b61b2a0070a83d63cb7afb513d3f)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit d26086a84c9909dcc96d4f35086f4028a3e4c8bd)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 38dc5c75c48254c79277424e789e36e58e92dc36
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Jan 15 18:20:09 2016 +0000
Bug 15375 [QA Followup] - Fix non-functional restriction message and date
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 43694867676ed627759a302ade7d666ab029490b)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit db2a954579499d8f21670c157ee50959fe50143e)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 70f5762fb6cd0a89e996496a9a7d2b4f176b805f
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Jan 15 18:02:49 2016 +0000
Bug 15375 [QA Followup] - Remove refereces to biblio and biblionumber for patron messages
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit a633af13b6851a15b71140ab123105d02c803da3)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 73bf2f2dc83974a9d33c7b02078697a84111def3)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit b5cca12611e368463da1f58c13cf800e01eb63a3
Author: Marc Véron <veron at veron.ch>
Date: Tue Dec 15 11:21:08 2015 +0100
Bug 15375 - Translatability: Fix issues on OPAC page 'Placing a hold'
Fix several issues with odd translations on opac-reserve.tt due to
string splitting by tags.
In addition, streamline messages to make them similar to the same
messages on the OPAC summary page (Bug 15374)
To test:
- Apply patch
- Log in to OPAC
- with blocked /debarred user (with and without comment and date)
- with user who has to much fines
- with user who has his card marked as lost
- with user with expired account
- with user with uncertain address information
- Try to put holds
- Verify that message about why holds are not possible is correct
and displays nicely and that links in messages work
- Carefully examine code
- Search for regressions
(Amended: stray i removed, test plan updated, removed account that
is about to expire)
Signed-off-by: Aleisha <aleishaamohia at hotmail.com>
I am going to sign off on this because it works as it should and I think the problems I had in comment 8 are a separate bug.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit f0face38698b5c803604b37509edad98e2291bcd)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit dceb3ed02284270af12b711014d30555115403f8)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit fffe15f7954476aacd8c951b662b82f9c3191102
Author: Hector Castro <hector.hecaxmmx at gmail.com>
Date: Mon Jan 11 22:34:01 2016 -0600
Bug 15190: Bad utf8 decode to unapi and fixing status code 200
Fix bad utf8 decoding, also fix status code 200 for no parameters passed to
script
To reproduce the issue in OPAC
1) Copy from LOC (Z39.50) ISBN 8467020113 or test it with whichever record with
special characters
2) Open URL in OPAC cgi-bin/koha/unapi?id=koha:biblionumber:4&format=oai_dc
play with oai_dc, srw_dc, mods, mods-full, mods3, mods3-full, rdfdc.
Note: marcxml does not fail
3) Enter the new biblionumber for ISBN 8467020113 or the record of your choise
4) An oai_dc record will display, notice about the bad utf8
decoding characters
5) Search the record in OPAC
6) To reproduce code 200 Ok and 300 Multiple choices play with:
cgi-bin/koha/unapi
cgi-bin/koha/unapi?id=koha:biblionumber:4
7) If possible test in NORMARC (UNIMARC will launch an error because bug 15162)
Test plan
-Apply patch
-Follow steps 2 to 6
-You will see no errors in utf8
Followed test plan, works as expected.
Signed-off-by: Marc Veron <veron at veron.ch>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 283d80729a49c8821a5ce95bcf3affd24cce93e6)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 4f976932a489f347becd5eb7f27952dcda35fa3d)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 856a2bd1a11200a0d03eb87cb55f279465917f9d
Author: Gus <gel1163 at stacmail.net>
Date: Wed Jan 20 03:42:42 2016 +0000
Bug 15624: Spelling mistake in suggestion.pl
Test - due to noone being in a comparison name it was not changed
1. search for choosen, see that it was removed
2. search for agregate, see that it was removed
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Typos fixed
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 9c2b0ea1158f7c3cd47e3ece8aa6575f78cc304f)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit ac36fe478adeb8d0565ca1538db25a57b60380cd)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 600b83a136b02d664f4c27dcc9b358e19724f44f
Author: Gus <gel1163 at stacmail.net>
Date: Wed Jan 20 02:56:07 2016 +0000
15623 - Spelling mistake in boraccount.pl Test - Search for writen, if not found fix is correct
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Gus: You should try git grep writen one more time :)
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 17a2426e0f6ea79eeea7e70acb670111ee6fa5f5)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit d5dd89ff78f733be327f258ed1b8be16e3d030ef)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 6a03a328987e54fe817e2e62bbfcbbd8d1d9becf
Author: Gus <gel1163 at stacmail.net>
Date: Wed Jan 20 02:45:16 2016 +0000
Bug 15621: Spelling mistake in printinvice.pl
Test- search for writen, if not found patch successful
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Typo fixed
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 12bd1dc60171fb9c85ef7176908a9f205190b2a6)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit e23abce8ddd275505caeaaef058e8a90bf61495a)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 2b19f959ce0c99b563f3adab12513f075fb62b47
Author: Gus <gel1163 at stacmail.net>
Date: Tue Jan 19 23:13:57 2016 +0000
Bug 15619: Spelling mistake in memberentry.pl
Test - Check file for 'konw', notice no instance
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Typo fixed
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 89978bab103cbcf7e83e69d47851e9b0bc16238a)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 45095c007839fb4cd46e52e2b3188d9d2b50ebda)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 5f51b6f9708acb8ff0a2dbc323621e383a4100b5
Author: Chloe <chloealabaster at gmail.com>
Date: Tue Jan 19 20:40:34 2016 +0000
Bug 15614 - Spelling mistake in circ/pendingreserves.tt: Fullfilled
To Test:
Check if "fullfilled" has been changed to "fulfilled" in line 137
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 A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 69b5fc9aa16891d7425685219a41078581ef2383)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 644e69cb7fa3aac68abe610b7b59045dc92d8d29)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 231f6d9ebe6cfc72f30d6f5460ffddfe7ca94713
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jan 20 16:14:22 2016 +0000
Bug 15613: Fix 2 other occurrences of paramter vs parameter
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 6c80367f85b92f7b66c9b6255f836bc29f40d660)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 8013976d3e00eb3c9ae3370aaa925e0c29048e06)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 03efedc3e9f8e718642840fae23d864ecaca2f7a
Author: Gus <gel1163 at stacmail.net>
Date: Tue Jan 19 20:28:43 2016 +0000
Bug 15613 - Spelling mistake in opac-shelves.tt
Spelling mistake in opac-shelves.tt paramter ==> parameter
To test - check the change is made in the file
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 A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 9a109fde4caf3e983f086e60f61cf2fa59b225dd)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 314f1f7a2f116bc6a18fe2f14883f5e3bf2a3760)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 4c8945df2386c0e37ba85e41735624307d63cb62
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jan 20 16:10:33 2016 +0000
Bug 15611: Fix another implimented vs implemented
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 2723e463c0f3b9ee6cec77309bf5f2d97779be02)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 6c1b8ddffee6f9c414a14e02b10b428b04eb5e5e)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit c0d4938a76ce0af04807762e9fd40db53a635f87
Author: Chloe <chloealabaster at gmail.com>
Date: Tue Jan 19 20:56:17 2016 +0000
Bug 15611 - Spelling mistake in patroncards/edit-layout.tt
To Test:
check that "implimented" has been changed to "implemented" on both lines
478 and 534
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 A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 88607dfaf1d470a24b0b27d0ef4b2be8967cf93a)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 74680de7361c31ae87ca35d3e4a6347b05747067)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit edf5844893500b6e624d291e7e339838afbf38c6
Author: Aleisha <aleishaamohia at hotmail.com>
Date: Mon Jan 11 21:15:46 2016 +0000
Bug 14641: [SIGNED-OFF] Warns in subscription-add.pl
Removes warn using Jonathan's suggestion!
To test:
1) Reproduce warns by clicking New Subscription
2) Apply patch
3) Click New Subscription again
4) Confirm warns are gone
Signed-off-by: Magnus Enger <magnus at libriotech.no>
Patch removes the warn that come when clicking "New subscription"
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 fe7940257537042ff6ffab9c7b718e5b8a5dc368)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 0e6346c614bd5707d79fc376dd4d9028c5086bc9)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 88d4d49b11b43fcc1de49a7c0f7027bf81de5e6f
Author: Aleisha <aleishaamohia at hotmail.com>
Date: Tue Dec 29 19:39:20 2015 +0000
Bug 14480: Silences warn from editing patron
Argument "" isn't numeric in numeric lt (<)
TEST PLAN
---------
1) Go to any patron in staff client
2) Click 'Edit'
3) Check error logs
-- warnings should exist.
4) Apply patch
5) Reload page
-- warnings should not be triggered.
6) Add restriction and save
7) Go back to edit screen
-- restriction should be shown
8) Remove restriction and save
9) Go back to edit screen
-- Should say "Patron is currently unrestricted"
10) Run koha qa test tools.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
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 11109501eb6c8b8ee55390cd9860ac6dbf8c908c)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit c08a13593cbc3a60ac3d5345c93c6c4c362a3835)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 258cb5aaef8dd94e92784c1a0c5de65bb0fab431
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Jan 13 11:16:02 2016 +0100
Bug 15553: [QA Follow-up] Replace hardcoded tmp and add instance to dirname
If you use multiple instances on one server, you could have the situation
that instance A creates the cgisess subfolder and instance B could have a
permission problem. This patch resolves that by allowing each instance to
have its own cgisess subfolder.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit c4934b2dab427da4304913b3f0f26e0a24606896)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit d259eaac7ba240cbe9008271d9d123a5758547d8)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 5a0dc0c2a49fcb960548fe90f0e97b6a8c12a1ff
Author: Blou <philippe.blouin at inlibro.com>
Date: Mon Jan 11 16:41:11 2016 -0500
Bug 15553 - [SIGNED-OFF] cgisess_ files polluting the /tmp directory
When some users want to improve performance, one suggestion is to switch the syspref "sessionstorage" to 'tmp',
which store the session info in the /tmp directory instead of the database.
Depending on the frequency of the cleaning process (or lack thereof),
this can be heavy pollution into the /tmp directory, making it unusable.
"rm cgi*" would not even work since cgi* extends to over 8000 items...
A simple fix is to modify the target directory in C4/Auth.pm to /tmp/cgisess.
Testing scenario:
1) change the syspref SessionStorage to 'tmp'
2) Log into the OPAC, validate that a file named /tmp/cgisess_(something) got created
3) Apply the patch
4) Log into the OPAC, validate that a file /tmp/cgisess/cgisess_(something) got created
Signed-off-by: Magnus Enger <magnus at libriotech.no>
Works as advertised. Session files are created in /tmp/cgisess/ instead
of directly in /tmp. I usually store sessions in memcached, but a
couple of times memcached has died on me, and before I knew it, /tmp
was so full of sessions files, I could not easily delete them with
"rm /tmp/cgisess*". Being able to delete /tmp/cgisess/ should be a
bit easier.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 3815915a3338c4380da7773acc675b07ac82562d)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 6efb2ebc0f81c5eaa7e42475495131f578487ffc)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 66e9870a3e50cd937cab93fc23085e372e66cf3e
Author: Chloe <chloealabaster at gmail.com>
Date: Tue Jan 19 03:09:50 2016 +0000
Bug 15468 - Search links on callnumbers with parentheses fails on OPAC results page
To Test:
1-before plugin search in opac for a call number with either a "(" or a ")" in it
2-it should come back with no results
3-use plugin
4-re-search the call number with "(" or ")"
5-the search should come back with results
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
It seems this only works with OPAC XSLT for results page turned off
and OPACItemsResultsDisplay turned on. - Then the callnumbers
in the result list will be linked for searching.
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 6d9a75014e1f1ef7dc84a3d14643271658eacc2e)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 27f9eb01197dddb95332871eb5c1ba4fe3589af0)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 4ccc3451101d6a8341c355bdf0e4129003d98a29
Author: Chloe <chloealabaster at gmail.com>
Date: Tue Jan 19 21:18:09 2016 +0000
Bug 15592 - spelling mistake in ~/Koha/koha-tmpl/intranet-tmpl/p./plugins/plugins-upload.tt
To Test:
checkthat "extention" has been changed to "extension" on line 27
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 A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 70086f1681155d8e63c9ee1b149c3f812df8f125)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 841aa118e575470af73ef3160c63a421b6d99b58)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 31a50f6eb76d0ba736e18c7133c2de513a505f3c
Author: Winona Salesky <wsalesky at gmail.com>
Date: Mon Jan 4 09:33:00 2016 -0500
Bug 15444 - MARC21: Repeated 508 not correctly formatted (missing separator)
This patch adds a separator for multiple 508 fields to the XSLT display
in the staff and OPAC detail view. Separator is wrapped in span with
class=‘separator’ for easy manipulation via css.
To test:
* Search the OPAC
* Click the title with multiple 508 fields
* Make sure the fields display properly
* Repeat for a few more titles
* Repeat in the Staff Client
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 1c5f75fde534db8a2b1329d5dfb83d34d9d29982)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit c68d58259ef27d187b67f8d39d8dd7578173b1e1)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit a51ef6e248cabe3ca81c978eee8c2f39b09afa39
Author: Marc Véron <veron at veron.ch>
Date: Wed Jan 6 10:29:01 2016 +0100
Bug 15476: Listname not always displayed in shelves.pl
To reproduce:
- In staff client, go to List and click on the name of an
existing list.
- At the bottom of the screen, you see a title "Add an item to "
but no list name.
To test:
- Apply patch
- Verify that listname appears after "Add an item to "
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Works as advertised. Label/legend for listname displayed Ok
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 df13a5d3e7727f6a7db67aac618fb85c135b2723)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 67c26ef476319149954794244310c990552dbf4e)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 85df13877290e4c0a4b659aadbcb2865c7058241
Author: Natasha <tasham_8 at hotmail.com>
Date: Tue Jan 19 02:51:49 2016 +0000
Bug 14624 - <<items.content>> for advance_notices.pl wrongly documented
To Test Check perldoc for misc/cronjobs/advance_noitces.pl
and see that the documentation matches.
Ran:
$ perldoc misc/cronjobs/advance_noitces.pl
Saw expected changes.
Koha QA test tools pass too.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Switched due date for the name of the database column
date_due as the parameter expects a list of database
column names.
(cherry picked from commit 4120e48b0ffe974636f8b070ea3c3f3956948409)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit b3586e5dc7b5c6646c403ee144b33853c21b77cb)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 14d59c88699dcd369624f65268184aa27807da0d
Author: Chloe <chloealabaster at gmail.com>
Date: Tue Jan 19 21:02:13 2016 +0000
Bug 15609 - spelling mistake in :692: writen ==> written
To test:
Check that "writen" has been changed to "written" on line 692
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 A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit f37ce198feae78b82b751f1c3d682010b4db0305)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 87e96810fc548c3301be54135fa6cc918f83f1fc)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 44a331a2b420ec5345274589c76347b225f0b2d3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jan 7 12:50:35 2016 +0000
Bug 15299: Ask for confirmation when deleting a report from second page
Some link are hidden when loading the page, by DataTables, we need to
use the delegate jQuery method to attach a handler to the click event
for all delete links (the ones existing when loading the page, and the
ones displayed in the future).
Test plan:
Have more than 20 reports defined
Go on the report list view, then change the number of elements
displayed, click "action>delete". You should get a warn.
Signed-off-by: Liz Rea <liz at catalyst.net.nz>
Confirm that there is now a confirmation on delete from the list -> action menu
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit dcce65c8fd6f6d4963a3dd0e8b73a79548a2aa8b)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Conflicts:
koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
(cherry picked from commit dfdf3c15de1fc741f6aafcea83d340728c6bffc3)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit cacbfbf834ffbba85a6778eb311e839aa886913f
Author: Briana <brianagreally at gmail.com>
Date: Tue Jan 19 01:21:50 2016 +0000
Bug 14810 Improve messages in patron anonymizing tool
To test:
Create circulation records
Go to 'http://localhost:8081/cgi-bin/koha/tools/cleanborrowers.pl'
Anonymize patron checkout history
Message should read 'All checkouts older than [date] have been
anonymized
When patch is not applied, message reads 'All patrons with checkouts
older than [date] have been anonymized"
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 A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit e38564d2132e1e102cec23d239fb81cd987b3de8)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 2f3843af990491ea9e628c064838b904f9e9223d)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 8e554c858137c5a16d52fc96e24128e45d56a416
Author: Martin Stenberg <martin at xinxidi.net>
Date: Mon Sep 21 13:16:39 2015 +0200
Bug 14555: Warns in opac-search.pl
Avoid use of uninitialized value in split
== Test plan ==
1. Go to opac advanced search
2. Click "Search" without any search query
3. Log file will show "Use of uninitialized value in split at ..."
4. Apply this patch
5. Repeat step 1 and 2
6. Log file should no longer show "Use of uninitialized value in split at ..."
Sponsored-by: Regionbibliotek Halland / County library of Halland
Signed-off-by: Aleisha <aleishaamohia at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
At step 2 you have to check a criteria
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit ab81a0feeebf1c01857755f53060dcc255960e9b)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 34f20412f89e9320e0fe2a0a3778a3e680566ec3)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit fa83ce9b6ed410cd99d51c35b29262e41ad19a4b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Dec 21 12:31:59 2015 +0000
Bug 12636: Do not display unique patron attributes in the batch patron modification
Batch patron modification should not offer to update patron attributes
with values which are designated as unique since such attributes are
required to be unique to a single patron.
Test plan:
Create some patron attributes, some should be unique.
Use the batch patron modification tool to modify patrons.
With this patch, the patron attributes marked as unique won't be
display anymore.
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 b7b94b7012704d99a91ce32723404095a68fe6f1)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 4c0506f33e07807d548fe4870d25ea367015c0e1)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit e56a39f657dfde13b5e73598dcba38a90e584606
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Aug 21 10:43:13 2015 +0100
Bug 14133: Print notices should be generated with the print template
If the overdue notice to send is an email or a SMS and the patron does
not provided such information, a print notice is generated.
But it will be generated with the email or sms template, which is not
useful, especially in the SMS case.
The template to use should be the print one.
Test plan:
0/ Does not apply this patch and Correctly define the overdue rules to generate
an overdue notice to the message_queue table.
Check email + SMS
1/ Define an email address and a SMS number for a patron
2/ Generate the overdue notices (misc/cronjobs/overdue_notices.pl [-t])
3/ 2 notices should have been generated:
mtt=email with the email template used
mtt=sms with the sms template used
4/ Truncate the message_queue table
5/ Remove the email address and repeat 2
6/ Only 1 notice should have been generated:
mtt=print with the email template used
7/ Truncate the message_queue table
8/ Remove the sms alert number and repeat 2
9/ 2 notices should have been generated:
mtt=print with the email template used (or sms I suppose)
10/ Apply this patch and repeat previous steps.
The print notices should be generated with the print template.
IMPORTANT NOTE: This test plan does not take into account the notices
generated for the staff ("These messages were not sent directly to the
patrons."). However the behavior will also change, the print template
will be used in all cases. Is it what we want?
Signed-off-by: Chris <chris at bigballofwax.co.nz>
Seems fine by me
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 581759e985c170db0edb4a895cda641930e5ac11)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit d55a5ca464f6af91419cab74ee91dbacff9c9722)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 822cb5158696d0f35222c9899ce031a2ac310122
Author: Aleisha <aleishaamohia at hotmail.com>
Date: Thu Jan 14 02:33:23 2016 +0000
Bug 15577: Correcting link redirect
To test:
1) Add a restriction to a user
2) Log in as that user in the OPAC
3) Click 'your account page' link in the yellow mesage
4) Confirm you are taken to opac-account.pl
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Works as advertised
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 5b6457087d0c8be00cbe3d54a7e157706f74908b)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 7cfa560631c5a0d116b02aa0499f9da69f8351c0)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 05ef470ecbd2eaccf1577f07ed9e5f750fcd931a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Dec 14 09:32:50 2015 +0000
Bug 15357: Display existing holds even if no items exist
If all the items have been deleted for a record and holds exist, the
holds are not displayed. You are not able to delete the items from the
record detail page, but you can from the items page.
Test plan:
1 - Place 1 or more title level holds on a record.
2 - Delete each item individually.
3 - Note that you see the number of holds on the record details page
With this patch, that holds are accessible via the holds tab.
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 0e4b703d239551207ca72c5b201475418c7cfd9c)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 2903bc2909180d3f021f7caf2c1181b2a00c5b2f)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit dead28ef19bffe1e3fa8dd8abb5cea4a6e3ed091
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jan 5 14:37:20 2016 +0000
Bug 15353: Display the patron image where needed
On the 3 following pages, the patron image was not displayed:
members/discharge.pl
members/pay.pl
members/paycollect.pl
Test plan:
Apply this patch and confirm the image is now displayed
Followed test plan, image displays 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 bb0c2fce1b87222933bfa5dd02ca614521ba2a0c)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 64eb1f88ea741ca06b0a17bf4186ad25c7487f81)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 1692d597e29a9b53c4979b2eb48e18f31c01c6e5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jan 5 15:41:36 2016 +0000
Bug 15398: Hide Staff members only in the patron deletion/anonymization tool
On bug 9076 (commit 568a4c1230ee9a4002181fcab2c083faf6c323a9), the plan
was to hide the Staff members from the tool.
But the test was wrong, it was done on the category_code instead of the
category_type value.
Test plan:
1/ Create a category 'Student' which is not part of the Staff
(category_code=S, category_type!=S)
2/ Create a staff category (category_type=S)
3/ Go on the deletion/anonymization tool (tools/cleanborrowers.pl) and
confirm that the category Student category is displayed in the dropdown
list.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Work as described, no errors.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
http://bugs.koha-community.org/show_bug.cgi?id=15308
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 6f0cdee69b670f1c49693198e335deb26470d961)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 5349313187dbea4804b7d0e28db7ad16827afbe5)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit c5c3d47621cfb39df13fc7e4227fda056813e379
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jan 19 16:58:07 2016 +0000
Bug 15391: Fix HoldsQueue.t tests
Prior to this patch, in HoldsQueue.t:
63 my @item_types = C4::ItemType->all;
64 my $itemtype = grep { $_->{notforloan} == 1 } @item_types
65 or BAIL_OUT("No adequate itemtype");
Then we use the $itemtype variable (which contains the number of item types not for loan):
92 $dbh->do("INSERT INTO biblioitems (biblionumber, marcxml, itemtype)
93 VALUES ($biblionumber, '', '$itemtype')");
There is obviously something wrong here.
The code should be
64 my @not_for_loan = grep { $_->{notforloan} == 1 } @item_types
65 or BAIL_OUT("No adequate itemtype");
66 my $itemtype = $not_for_loan[0]->{itemtype};
But then some tests don't pass:
Actually the problem comes from:
commit bfbc646fdd9ca4b90a0bc2751d0faa95d9e93ba1
Bug 10336: HoldsQueue.t needs to create its own data
-my $itemtype = $dbh->selectrow_array("SELECT min(itemtype) FROM itemtypes WHERE notforloan = 0")
+my @item_types = C4::ItemType->all;
+my $itemtype = grep { $_->{notforloan} == 1 } @item_types
The line should have been:
my $itemtype = grep { $_->{notforloan} == 0 } @item_types
Test plan:
Confirm that the tests still pass after this patch applied.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
All tests pass pre and post patch
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 b340d1f5bd02e1ddb535db13e321e6b07a166725)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 31ab3b277c51c5ae8c3b6ccdfa2a9e007b85a0e3)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit c5cb615f9ce18b650a270e444dbc6868aa09fa0d
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Jan 14 12:29:45 2016 +0100
Bug 9754: koha-remove optionally includes var/lib and var/spool
Currently, the files in the folder /var/lib/koha/[instance] and also
in /var/spool/koha/[instance] are not removed.
This patch adds the option -p|--purge-all to include those two
directories when removing files.
Note: There was a small bug in the for loop. On the -k line the extra
shift statement is one too much.
NOTE: Verify that you use the adjusted koha-remove in the test plan
and not accidentally an older version of this script.
Test plan:
[1] Create an instance test.
[2] Run koha-remove and verify that /var/lib/koha/test still exists.
[3] Create an instance test2.
[4] Run koha-remove -k -p and verify that the sql database still exists
but the two instance folders in var/lib/koha and var/spool/koha are
gone.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
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 1d99fa026bb05225df93e56740456ba185a5937d)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 69fd29942c843b8b15df1bb75cd25451344341ba)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 11796d60fa3167bd8b715a2289f90272e65af360
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Dec 28 15:47:01 2015 +0000
Bug 15209: Check the parameter at the beginning of the subroutines
It seems better to check if parameters exist at the beginning of a
subroutine.
It makes the code easier to read and there is 1 indentation level less.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 372881ebfd5552ecb83450c7afea6a76f2df1a0b)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 7132c9b49ca0c2abf7592d56e4b467be9107dd3f)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 87388b7d3ac56b609e43c1600564d998693b6c3e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Dec 28 15:46:59 2015 +0000
Bug 15209: Add tests
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit c273e888b0468c6d8e943f9989f6680dc63203fa)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit bc287802a996b265d008845867f1691eeca576d9)
commit 60e9074bec01d4e16502bb0f9535ba8d11dcf391
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Wed Nov 18 14:53:58 2015 +0000
Bug 15209 Validate passed MARC::Record objs in C4::Koha
Ensure that a passed MARC::Record is defined before calling
its methods. Otherwise you are open to occurences of the
error 'Can't call method "field" on an undefined value'
In a CGI environment you can live with such sloppiness but
in a persistent environment the error can cause the instance
to abort.
Made all routines passed a MARC::Record validate it before calling
its methods. Changed the parameter name from the meaningless
record to marcrecord to indicate its content. Added an explicit return
for all cases where no valid data returned. Cleaned up some logic for
clarity. I think we can assume that GetNormalizedOCLCNumber meant to
look at all 035s till it found an OCLC number not just the first.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 960458dee4a9c09506f48fa73950c0e2da3611e7)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 958985b2ff7304cc55a620e0cd1f09d31d213463)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 7d81810d148dccded70c3cd3ab0a5b7cfd1c2d74
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Jan 27 15:44:31 2016 +0100
Bug 15240: [QA Follow-up] Minor adjustments
This patch does:
[1] It removes some unused modules.
[2] It adds some options not listed in the synopsis.
[3] It removes an unused sql expression from one query.
Note: In fines related code the third parameter of CalcFine sometimes
is named as days_overdue too.
[4] Corrects a few typos in comments or pod.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 8d072272fa396820ec655fb7b45d30eee6fca3e8)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit b94fc3419dc04d06d7557753cea619633ab4c8dd)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 153877f10fd615213fb22f850965ca374b8c02c8
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Dec 9 11:10:33 2015 +0000
Bug 15240: Do not process issues with a date due later than today
There is no need to do this job in Perl, MySQL could do it instead.
The idea is to only retrieve the issues info which could be overdued.
To test:
1/ Run the script
2/ Apply the patch
3/ Run the script again, notice the exact same results but execution time is faster
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 0d36c27678a6968304990759657e2312338763eb)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit e46923af8829f7da9eb3b94e89831b32e68df040)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 7ab00713f020761fe40abce1f5f4ba55f613437c
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Jan 27 16:15:42 2016 +0000
Bug 15680 - Fresh install of Koha cannot find any dependencies
Revert "Bug 6679 - [SIGNED-OFF] fix 2 perlcritic violations in C4/Installer/PerlModules.pm"
This reverts commit 0e356b214eb049a446a8d089d579775aa49287d7.
Fixing the evals in PerlModules.pm to pass perl critic has caused
a regression. If appears that using a block eval will not work here,
at least not in its current form.
(cherry picked from commit c2f667b4f220c5f3cfb904759b5d4bee679f1ed7)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit ff73d0415fade98b79dcaa185640fff694ea80a5)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 4ebed3e6364a460b84073ecc3d8f3cbe4b75ab76
Author: Chloe <chloealabaster at gmail.com>
Date: Thu Jan 21 23:47:42 2016 +0000
Bug 12045 - Transfer impossible if barcode includes spaces
have changed the code which strips the white space to only remove the leading and trailing white space instead
To Test-
1- go to circulation -> transfer
2- attempt to tranfer an item where the barcode has a space in the middle of it
3- it should fail
4- apply patch
5- try again
6- it should work
NOTE: I purposefully added: die "($barcode)";
Before, all spaces were removed.
' white space ' became '(whitespace)'
After, only external spaces were remove
' white space ' became '(white space)'
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 47caf69a469cb48ef18754d2e3bf077e5e882aa4)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 8fa06fdfde407522d6f647527e1b3fefa52a154d)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 9e456ee006a457bd5afc5859bfff269e97677abb
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Jan 8 17:00:36 2016 +0000
Bug 15530 - Editing a course item via a disabled course disables it even if it is on other enabled courses
It appears that if the course item is edited by clicking the edit link
from an active course, the course item will be set to enabled and the
fields will be swapped, if the same course item is edited from a course
that is *not* active, the course item will be set to *not* enabled, and
the original fields will be swapped back in!
The short term work-around is to only edit course items from an enabled
course if the item has a course that is enabled. If all the courses it
is on are disabled, it doesn't matter what course the item is edited
from.
Test Plan:
1) Create two courses, 1 enabled and 1 disabled
2) Add an item as a course reserve to both courses
3) Edit the course reserve data for the item via the enabled course
4) Note the course item is enabled ( easy way is to check the database )
5) Edit the same course reserve data, but via the disabled course
6) Note the course item is now disabled even though it is part of
an enabled course!
7) Apply this patch
8) Repeat steps 1 through 5
9) Note the course item is still enabled
Signed-off-by: Margaret Holt <mholt at bastyr.edu>
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 d10adb26aa661a6b5f6dc9b2fd6f8ab966f98918)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 4739952294165f764ee7074f5a71235e328697a3)
commit 56242f3452984be7f92cbc598007e39757d25c24
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Jan 8 17:00:18 2016 +0000
Bug 15530 - Add Unit Test
Signed-off-by: Margaret Holt <mholt at bastyr.edu>
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 31ffdbf49af617db29c8b6bfcaf01566d84f2a33)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit cd7d29440f8b1f88b88cba0d9934e3907847793b)
commit 5ffe29c646e73b5cf594ac3062e2a018647315b2
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jan 19 08:55:49 2016 +0000
Bug 15188: Do not remove unused auths if zebra is not reachable
Other conn errors should be checked (wrong user/pwd, etc.)
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 a60943bc1b28696459ea5a28df9874083b9f0966)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 67b3f0196ea4129488193f27fd3e28591ff5f33d)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 61c4621217f39fff2e2d91753a028f38c6ece71e
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Tue Dec 29 16:46:38 2015 +0100
Bug 15188 - Fixes remove_unused_authorities.pl will delete all authorities if zebra is not running
Test plan:
1) Shut down zebra: koha-zebra-ctl.sh stop
2) Execute the script: remove_unused_authorities.pl (with -t if you
don't want to really delete from your database).
3) Check that the script would have deleted all the authorities (eg:
31449 authorities parsed, 31449 deleted and 0 unchanged because
used).
4) Apply patch
5) Run, notice that the script dies because zebra is unavailable
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
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 128e7f54b17501ee43614aa8f8c50c3789921f08)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 6b6213deea813bf9040dfa5232546b9a48b41e37)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit c3ed8d41526221acc233182a85d66973078e8220
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Dec 9 09:48:58 2014 +0100
Bug 6679: (follow-up) fix 9 perlcritic violations in C4/TmplTokenType.pm
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 8ca35dc7a9291a685a4d22aaf2c18e8023c7be4f)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 8022419f58b7dc861f235e568b4abd4c9b26f352)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit cf83f047cad2ac5dd19e7d4f198700c5f0e98a28
Author: Mason James <mtj at kohaaloha.com>
Date: Tue Sep 25 11:21:43 2012 +1200
Bug 6679 - Fixing code so it passes basic Perl:::Critic tests
opac/ilsdi.pl: Stricture disabled at line 217, column 17. See page 429 of PBP. (Severity: 5)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit f2eb9681457627e24ba44bcbb0aa64792a88cc4e)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit a6f2231b4fe772b2f2fa5c5ac3bed3449013f163)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit e6282f66cacfd04e7fe9280b118d28f0c824007f
Author: Mason James <mtj at kohaaloha.com>
Date: Wed Jun 27 05:07:46 2012 +1200
Bug 6679 - [SIGNED-OFF] fix 2 perlcritic violations in C4/Installer/PerlModules.pm
Expression form of "eval" at line 71, column 9. See page 161 of PBP. (Severity: 5)
Expression form of "eval" at line 85, column 13. See page 161 of PBP. (Severity: 5)
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 0e356b214eb049a446a8d089d579775aa49287d7)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit f8bd7e717927c65782f544ee0b5a3ec38a3330ad)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit f44d4ba891775670d51f034603db7aa702c65f9b
Author: Mason James <mtj at kohaaloha.com>
Date: Wed Jun 27 01:08:34 2012 +1200
Bug 6679 - [SIGNED-OFF] fix 9 perlcritic violations in C4/TmplTokenType.pm
- Subroutine prototypes used at line 86, column 1. See page 194 of PBP. (Severity: 5)
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit ae546e3adefaf06279e4a380346a4a302acd869a)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 25344fa446836a99e74f5931ee702748001897e1)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit af677b11d18a04f284dd1e908f0cf2e0486104df
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jan 11 11:32:23 2016 +0000
Bug 2669: Change checkboxes to radio buttons on dictionary
On creating new dictionary for report, the choice between "All dates"
and "Date range" should be a real radio button, not 2 radio buttons with
different names (which means they could be selected altogether...)
Note that I don't understand what means 'All dates', there is no
condition generated for the dictionary. We should not have to select a
field if we don't want to add a condition on it :)
Test plan:
Create a new dictionary for the Patron module, then a date field
(dateenrolled or birthdate, etc.)
Confirm that the radio buttons now behave as radio buttons...
Signed-off-by: Aleisha <aleishaamohia at hotmail.com>
Looks so much nicer too!
Radio buttons display as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit bb6658c2e680d615bccd6d5d2f4c971035a44ea1)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 58f3635e6cbc6e5ca0fe086d161237c6e989bfe0)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 5 +-
C4/CourseReserves.pm | 22 +++---
C4/Koha.pm | 64 ++++++++--------
C4/TmplToken.pm | 2 +-
C4/TmplTokenType.pm | 18 ++---
circ/branchtransfers.pl | 4 +-
debian/scripts/koha-remove | 10 ++-
.../prog/en/includes/doc-head-close.inc | 2 +-
.../intranet-tmpl/prog/en/includes/header.inc | 2 +-
.../prog/en/modules/admin/clone-rules.tt | 2 +-
.../prog/en/modules/admin/z3950servers.tt | 15 +++-
.../cataloguing/value_builder/unimarc_field_100.tt | 2 +-
.../prog/en/modules/circ/pendingreserves.tt | 2 +-
.../intranet-tmpl/prog/en/modules/intranet-main.tt | 2 +-
.../prog/en/modules/members/memberentrygen.tt | 7 +-
.../prog/en/modules/patroncards/edit-layout.tt | 4 +-
.../prog/en/modules/plugins/plugins-upload.tt | 2 +-
.../prog/en/modules/reports/dictionary.tt | 36 ++++-----
.../en/modules/reports/guided_reports_start.tt | 2 +-
.../prog/en/modules/reserve/request.tt | 10 +--
.../prog/en/modules/tools/cleanborrowers.tt | 6 +-
.../prog/en/modules/virtualshelves/shelves.tt | 2 +-
.../prog/en/xslt/MARC21slim2intranetDetail.xsl | 1 +
.../bootstrap/en/modules/opac-auth-detail.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 78 ++++++++++++--------
.../opac-tmpl/bootstrap/en/modules/opac-results.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 4 +-
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 2 +-
.../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 1 +
members/boraccount.pl | 2 +-
members/discharge.pl | 3 +
members/memberentry.pl | 2 +-
members/pay.pl | 3 +
members/paycollect.pl | 7 +-
members/printinvoice.pl | 2 +-
misc/cronjobs/advance_notices.pl | 4 +-
misc/cronjobs/overdue_notices.pl | 33 +++++----
misc/migration_tools/remove_unused_authorities.pl | 7 ++
opac/ilsdi.pl | 9 +--
opac/opac-main.pl | 2 +-
opac/opac-reserve.pl | 9 ++-
opac/opac-search.pl | 5 +-
opac/unapi | 6 +-
reports/dictionary.pl | 49 ++++++------
serials/subscription-add.pl | 1 +
suggestion/suggestion.pl | 4 +-
t/Auth_with_shibboleth.t | 2 +-
t/Koha.t | 7 +-
t/db_dependent/CourseReserves.t | 24 +++++-
t/db_dependent/HoldsQueue.t | 3 +-
tools/modborrowers.pl | 1 +
51 files changed, 286 insertions(+), 210 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list