[koha-commits] main Koha release repository branch 3.16.x updated. v3.16.13-15-g29181da
Git repo owner
gitmaster at git.koha-community.org
Fri Aug 28 05:14:13 CEST 2015
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.16.x has been updated
via 29181dae407a1828ae9e29775aefbb0c72f860e1 (commit)
via 0a52185f110ac99b1ef326b6e1d548271e563f54 (commit)
via 9cdc595c67bedc82dbd7344c27ee46978f74db77 (commit)
via 97ce5fe66b5033d102f78ddc03619c73458020a4 (commit)
via 5a6a263d8f2482074fe187b124af6a4008924a3a (commit)
via 34e69a4a9eb8449c400cf928d9c3701cc8eab45f (commit)
via e0c37b2b6b3409cc39773a62cc45c4102d27a1dc (commit)
via 13ee28896d90eb0493443cd30a8d3197b520f482 (commit)
via 5ef25fed154172b3237e317f8257d75a3b5002b1 (commit)
via ec57f1c8b6982b662c6e444333837030a2cf1201 (commit)
via e55819cad9bee00c63f4eeb88d8d08feb657e820 (commit)
via 710a470e0bb1a320f60046facc8389b42ab9525b (commit)
via 8b3e00d9b9c6f007f15df6c337260db45855ca4b (commit)
via e124a8c94c25b376e654d5e0812060f6f7f78135 (commit)
via 05503f137a884620d39e86dc6365c207a3d99733 (commit)
from 71a69181b1ea37df86cbeeafd34e9704104a22b5 (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 29181dae407a1828ae9e29775aefbb0c72f860e1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 19 15:42:10 2015 +0100
Bug 14566: Fix permissions in patronimage.pl
There is no permission needed to access the patronimage.pl script.
This means anybody cans access to the patron's images.
Test plan:
Add an image to borrowernumber 42 and call
/cgi-bin/koha/members/patronimage.pl?borrowernumber=42
If you are logged in with borrowers permissions, you will see the image,
otherwise you will get a blank page with a 403 header.
Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Conflicts:
members/patronimage.pl
commit 0a52185f110ac99b1ef326b6e1d548271e563f54
Author: Liz Rea <wizzyrea at gmail.com>
Date: Mon Aug 17 09:47:27 2015 +1200
Bug 13663 - QA Followup, removing tab chars
commit 9cdc595c67bedc82dbd7344c27ee46978f74db77
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Thu Jun 11 10:55:35 2015 +0200
Bug 13663: Fix permissions in upload-file.pl and upload-file-progress.pl
Test plan:
Verify that the circulate_remaining_permissions perm is enough to upload
.koc file.
Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit 2fcc02321f0f56760cfdbd67a29917e4f0ba278b)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 97ce5fe66b5033d102f78ddc03619c73458020a4
Author: Stéphane Delaune <stephane.delaune at biblibre.com>
Date: Thu Jul 23 16:28:57 2015 +0200
Bug 10961: (followup) Make query fields explicit and add regression tests
add correct frameworkcode to _koha_marc_update_bib_ids parameters
add test, prove with : prove t/db_dependent/Biblio.t
TEST PLAN
---------
1) git checkout -b bug_10961 origin/master
2) git bz apply 10961
3) git checkout origin/master -- C4/Biblio.pm
4) prove t/db_dependent/Biblio.t
-- was expecting failure, got failure.
5) git reset --hard origin/master
6) git bz apply 10961
7) prove t/db_dependent/Biblio.t
-- success as expected.
8) Read over code.
-- Noted it also grabs the framework code for the biblio, rather than uses default.
And it also corrects an indentation issue.
Test case looks like it attempts to cover the biblionumber!=biblioitemnumber case
by adding 1.
9) run koha qa test tools.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit 62dc6b0ca15a9de99a1cb41809e6c9c016e6b0d0)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Conflicts:
t/db_dependent/Biblio.t
commit 5a6a263d8f2482074fe187b124af6a4008924a3a
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Sep 27 12:53:39 2013 -0400
Bug 10961: Error in GetMarcBiblio can cause severe data loss
A bug in GetMarcBiblio can cause severe data loss if your database has
records where the biblionumber and biblioitemnumber do not match and the
script misc/batchRebuildBiblioTables.pl is run.
The Biblio::GetMarcBiblio makes a kall to
C4::Biblio::_koha_marc_update_bib_ids which passes the biblionumber as
both the biblionumber *and the biblioitemnumber*.
Thus, if your biblio and biblioitem numbers are not always equal, you
will end up with a record where the biblioitemnumber is incorrect in the
record!
This is usually not a severe issue, but since batchRebuildBiblioTables
uses that record to update the database tables, it ends up updating the
wrong biblioitem row!
NOTE: What a horrible, horrible typo that was. Tested this with the
second patch.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit 298c4c76a5f231d9cc0935b6f14a5f191b727804)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 34e69a4a9eb8449c400cf928d9c3701cc8eab45f
Author: mxbeaulieu <maxime.beaulieu at inlibro.com>
Date: Mon Jun 15 11:05:51 2015 -0400
Bug 14387: Merge reference selection has no effect when merging authorities.
This patch swaps the authority records according to the refenrece record selection.
To TEST:
Merge two authority records, select the second as merge reference.
The reference authority is always the first.
Apply the patch.
Repeat previous steps, the authority is now merged using the selected reference record.
modified: authorities/merge.pl
Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit ee7666a5fdd1b04f1bf50aa89900488e1a01402b)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit e0c37b2b6b3409cc39773a62cc45c4102d27a1dc
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Sun Jul 5 13:17:02 2015 +0200
Bug 11693: Default emailing preferences not loaded for self registering patron
The call to AddMember_Opac does not take care of the messaging prefs
when enhanced messaging is enabled.
This patch adds the call to handle_form_action to do that.
Test plan:
Enable self registering patrons and enhanced messaging.
Check the (default) message prefs for the relevant patron category. At least
enable email for one notice.
Self-register a user with and without verification email enabled.
Check in both cases that the message prefs of the user conform to
those in the patron category. (So at least one enabled.)
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: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit f7ed250d618c57a3fc00728bbb93460b25ceda52)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 13ee28896d90eb0493443cd30a8d3197b520f482
Author: Jacek Ablewicz <abl at biblos.pk.edu.pl>
Date: Wed Jun 24 19:43:05 2015 +0200
Bug 14456: EmbedSeeFromHeadings record filter shouldn't process MARC holding fields
If the system preference IncludeSeeFromInSearches is enabled, records
exported for zebra indexing are being additionally processed by
EmbedSeeFromHeadings record filter (right now used only in rebuild_zebra.pl
script). This filter embeds 'see from' fields (extracted from authority
records linked with the given biblio via $9 subfields) into target MARC
record, which is then subsequently indexed in zebra.
Currently all fields containing $9 are getting the same exact treatment
by this filter. But on the export stage when the filter is applied, MARC
record being processed already does have holdings data fields added in
the previous stage (usually 952 / 995, depending on the MARC format).
Problem is that holdings data fields use to have $9 subfields in them
as well (mapped to item.itemnumber by default). As a consequence, some
(great many in the typical setup) records exported for zebra indexing
may have surplus "see from" fields added erroneously in semi-random
fashion, so biblio searches would often return some completely
unexpected additional results.
EmbedSeeFromHeadings record filter should not process holdings fields
when dealing with MARC records intended for zebra indexing.
To reproduce:
1) database with as many sample or real-world biblio, item and authority
records as possible is recommended for testing purposes
2) enable IncludeSeeFromInSearches
3) export a bunch of biblio records for zebra (e.g.:
misc/migration_tools/rebuild_zebra.pl -I -b -x -k -length=1000),
inspect the result xml records in /tmp/<whatever> file; observe that at
the end of many records, here and there some extra "see from" (= 1st
indicator: 'z') fields tend to appear, which shouldn't be there ;)
To test:
4) apply patch
5) redo 3)
6) compare results from 3) and 5) with diff
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
I introduced a regression test for this. You should run the tests
without/with the patch and verify that the patch actually fixes the problem.
Good job Jacek! I'm sure writing the regression test would take less time
than such a detailed commit message!
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit f3a8b7a0e1e1bf112628c6215105ab80f25ed94f)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 5ef25fed154172b3237e317f8257d75a3b5002b1
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Jul 20 11:38:56 2015 +0200
Bug 14569: Typo borroewr|borow
Trivial correction. Only touches comments.
Test plan:
Run git grep -E "borroewr|borow". You should not find anything now.
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Typos in comments corrected.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 7d4e7e4e525fc99cb4452de135e161a0e0866753)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit ec57f1c8b6982b662c6e444333837030a2cf1201
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date: Thu Jul 9 10:31:07 2015 +0100
Bug 14404: Rename class no-show to noshow for consistency with nosort
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit 0183cc0223678f6b3f0885213c7223ddb31acf5d)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit e55819cad9bee00c63f4eeb88d8d08feb657e820
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Jun 16 19:05:10 2015 -0400
Bug 14404: Checkouts default sort order for Self Checkout (SCO) confusing for patrons
Libraries are reporting that patrons are very confused during
self-checkout. The problem is they are expecting the list of checkouts
to be in the order they checked out the items ( first checkout on the
bottom, last item checked out on top ). However, the checkouts
table is sorted by title ( ascending ) then due date ( descending ).
This is not intuitive.
Test Plan:
1) Enable Koha's self checkout
2) Use the SCO to check out a random assortment of items,
make sure you don't check them out in alphabetical order
3) Note the order of the items in the list is not based on the order
you checked them out in
4) Apply this patch
5) Refresh the page
6) Note the items are now in the order you checked them out
with the last on top and the first on bottom
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit e9061028c1ba95b310be5e9333b224e735e64f40)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 710a470e0bb1a320f60046facc8389b42ab9525b
Author: Aleisha <aleishaamohia at hotmail.com>
Date: Wed Jul 1 01:36:00 2015 +0000
Bug 14445: Silences warns in letter.tt
When creating a new notice, warn is triggered "Argument "" isn't numeric in numeric gt (>) at line 400". Same warn is triggered when changing Koha module option to any other module.
To test:
1) Go to Tools, then Notices & Slips
2) Click 'new notice'. Notice warn in intranet-error.log
3) Change Koha module to another module. Notice warn is triggered for every change
4) Apply patch and reload page
5) Change Koha module to another module. Notice there are no longer warns
6) Go back to Notices & Slips and click 'new notice' again. Notice there are no warns
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit 7098a36b19c35a06a51361bd381416a1204de38d)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Conflicts:
koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
commit 8b3e00d9b9c6f007f15df6c337260db45855ca4b
Author: Aleisha <aleishaamohia at hotmail.com>
Date: Wed Jun 24 01:15:32 2015 +0000
Bug 14445: Silences warn in letter.pl
When changing Koha module to 'Circulation', there is a warn saying that $code is uninitialized. This patch sets $code to an empty string to silence the warn.
To test:
1) Go to Tools, the Notices & Slips
2) Click 'new notice' (This will trigger warns, but ignore these as they will be corrected in the next patch)
3) Change Koha module to 'Circulation'
4) Notice warn about uninitialized $code variable
5) Apply patch and reload page, change Koha module to 'Circulation'
6) Notice page still works and warns are gone
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit fe3a49e61133e1e66d0075f3300cd3a99e691890)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit e124a8c94c25b376e654d5e0812060f6f7f78135
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Jul 6 14:20:07 2015 +0200
Bug 14494: Terribly slow checkout caused by DateTime->new in far future
An expiry date like 9999-12-31 in the local timezone will make DateTime
spend a lot of time (maybe 60 seconds) on date calculation. See the
DateTime documention on CPAN.
A calculation in floating (or alternatively in UTC) would only take
a few milliseconds.
This patch makes two changes in this regard:
[1] The compare between expiry date and today in CanBookBeIssued has been
adjusted in Jonathan's patch. I am moving the compare to the floating
timezone (as was done in my original patch). This removes a hardcoded
9999.
[2] If ReturnBeforeExpiry is enabled, CalcDateDue compares the normal due
date with the expiry date. The comparison is now done in the floating
timezone. If the expiry date is before the due date, it is
returned in the user context's timezone.
NOTE: The calls to set_time_zone moving to or from floating do not adjust
the local time.
TEST PLAN:
First without this patch (and the one from Jonathan):
[1] Set expiry date to 9999-12-31 for a patron.
[2] Enable ReturnBeforeExpiry.
[3] Checkout a book to this patron. This will be (very) slow.
Continue now with this patch applied:
[4] Check in the same book.
[5] Check it out again. Should be much faster.
Bonus test:
[6] Set borrower expiry date to today. Change relevant circulation rule
to loan period of 21 hours. Test checking out with a manual due date
/time just before today 23:59 and after that. In the second case the
due date/time should become today 23:59 (note that 23:59 is not
shown on the checkout form).
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: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit 17d04c46190880d3031adbc02553f82234d70fc1)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 05503f137a884620d39e86dc6365c207a3d99733
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date: Thu Jul 9 09:52:28 2015 +0100
Bug 14494: Prevent slow checkout if the patron does not have an expiry date
If a patron has a expiry date set to 9999-12-31 (for organizations for
instance), the checkouts are very slow.
It's caused by 2 different calls to DateTime in CanBookBeIssued:
1/
DateTime->new( year => 9999, month => 12, day => 31, time_zone => C4::Context->tz );
The time_zone should not be set (as it's done in Koha::DateUtils), set to UTC or floating tz.
2/
DateTime->compare($today, $expiry_dt)
The comparaison of 2 DT with 1 related to 9999 is very slow, as you can
imagine.
For 1/ we need to call Koha::DateUtils::dt_from_string (actually, we
should never call DateTime directly).
For 2/ we just need to test if the date is != 9999, no need to compare
it in this case.
Test plan:
Before this patch, confirm that the checkouts are slow if the patron has a
dateexpiry set to 9999-12-31.
update borrowers set dateexpiry="9999-12-31" where borrowernumber=42;
After this patch, you should not see any regression when checking out
items to an expired patron and to a valid patron.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit 8d58acc565c8500d4b9d55cacb3d6d21628a899b)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Biblio.pm | 8 +++--
C4/Circulation.pm | 32 ++++++++------------
C4/Members/Attributes.pm | 2 +-
Koha/Filter/MARC/EmbedSeeFromHeadings.pm | 5 +++
authorities/merge.pl | 11 ++++---
installer/data/mysql/kohastructure.sql | 4 +--
.../intranet-tmpl/prog/en/modules/tools/letter.tt | 8 ++---
.../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 17 +++++++++--
members/patronimage.pl | 21 +++++++++----
opac/opac-memberentry.pl | 2 ++
opac/opac-registration-verify.pl | 2 ++
t/db_dependent/Biblio.t | 22 ++++++++++++--
tools/letter.pl | 4 +--
tools/upload-file-progress.pl | 21 +++++++++++--
tools/upload-file.pl | 20 ++++++++++--
15 files changed, 126 insertions(+), 53 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list