[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.09-17-gee61307
Git repo owner
gitmaster at git.koha-community.org
Tue Aug 11 03:56:04 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.18.x has been updated
via ee61307cafca5445cd7ce9149b1537641d523e61 (commit)
via 5c091650485e133c980d941365d8f1dcb5828e7f (commit)
via e298d5c83d8cbbad88c1bcebd4e49eac0efca10b (commit)
via 3494e9783432f07ae855dc655807f36cbf0c32c8 (commit)
via bbf39af949d59a6b90412843f7bf0377e54d9813 (commit)
via 688f95d893aa8d08bf098328cf3527e2a9a83a50 (commit)
via e64d9b63a7c6f7af5b8c0ba1a2a663fd255d0535 (commit)
via f79dc020899c4e9c998281e3c06b508cc0fa882e (commit)
via 05b29e605b5032713e2b10653a18120ca7974d27 (commit)
via 2b4f984203857dadecdaa1e14ab71a45209b3c21 (commit)
via 625abf61544863084cffcf77399463d363155cbd (commit)
via 2ec7d2864f1e25511ca2ff52456adecc3b37f339 (commit)
from 1277854315c99dc9f9238aa5a92706ce011d6fb1 (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 ee61307cafca5445cd7ce9149b1537641d523e61
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>
commit 5c091650485e133c980d941365d8f1dcb5828e7f
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 e298d5c83d8cbbad88c1bcebd4e49eac0efca10b
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Fri Jul 3 18:04:04 2015 -0400
Bug 14487: Noise best detected under Debian 8
The first error is caused by the fact that
$messages->{'IsPermanent'} is undefined.
The second error is caused by querying the CGI
parameter 'barcode' inside a function call. This is not required.
There is a variable $barcode set with the parameter. Changed to
use the variable.
TEST PLAN
----------
1) Test first patch.
2) Clear the log
3) Put in a barcode which is not checked out.
4) Check the log.
-- should be two errors. One about a hash,
the other will only be detectable under Debian 8.
5) Apply this second patch
6) Clear the log
7) Put in a barcode which is not checked out.
8) Check the log.
-- should be empty.
9) run koha qa test tools
Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
Signed-off-by: Nick Clemens <nick at quecheelibrary.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 beef8534724900e5777fc7b6d163763712decb1f)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 3494e9783432f07ae855dc655807f36cbf0c32c8
Author: Indranil Das Gupta <indradg at gmail.com>
Date: Fri Jul 3 13:33:06 2015 +0530
Bug 14487: silence warns during checkin
Test plan
=========
1/ check out an item and then check it back in.
1/ check the logs after the check-in to see the warns from
returns.pl line 623 of :
(a) Use of uninitialized value $holdingBranch
(b) Use of uninitialized value $collectionBranch
2/ apply patch
3/ check out and check-in again. no warns are recorded this time.
NOTE: Under Debian Jessie, there are other messages.
Additionally, this only corrects the line 623 ones.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Nick Clemens <nick at quecheelibrary.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 0d632a606f499c31afb8a08f81625c4dfbddb445)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit bbf39af949d59a6b90412843f7bf0377e54d9813
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 688f95d893aa8d08bf098328cf3527e2a9a83a50
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 e64d9b63a7c6f7af5b8c0ba1a2a663fd255d0535
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 f79dc020899c4e9c998281e3c06b508cc0fa882e
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 05b29e605b5032713e2b10653a18120ca7974d27
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 2b4f984203857dadecdaa1e14ab71a45209b3c21
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 625abf61544863084cffcf77399463d363155cbd
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>
commit 2ec7d2864f1e25511ca2ff52456adecc3b37f339
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>
-----------------------------------------------------------------------
Summary of changes:
C4/Biblio.pm | 8 +++++---
C4/Members/Attributes.pm | 2 +-
Koha/Filter/MARC/EmbedSeeFromHeadings.pm | 5 +++++
authorities/merge.pl | 11 +++++++----
circ/returns.pl | 7 +++++--
installer/data/mysql/kohastructure.sql | 4 ++--
.../intranet-tmpl/prog/en/modules/tools/letter.tt | 6 +++---
.../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 17 ++++++++++++++---
opac/opac-memberentry.pl | 2 ++
opac/opac-registration-verify.pl | 2 ++
t/db_dependent/Biblio.t | 19 ++++++++++++++++---
tools/letter.pl | 4 ++--
12 files changed, 64 insertions(+), 23 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list