[koha-commits] main Koha release repository branch master updated. v17.05.00-252-ga2c9513
Git repo owner
gitmaster at git.koha-community.org
Fri Jul 14 17:34:29 CEST 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, master has been updated
via a2c9513b1c3449a34f942d8fa53f8ce1fe374e3f (commit)
via ec51335e9cc4e090ef80f592cc0cc7a0786661f8 (commit)
via 441f6fac33975f7e0f7c96b262bc0c0ee3b0c82e (commit)
via 10d78b9a424d2719c52aa99d3cd642bf7e37e129 (commit)
via bd3b1c1a33e4bb14bbcd10a0fcf871b39362430d (commit)
via 2f1a1fc4b96a91fc054646f91643d8ff46456055 (commit)
via 313e1f2f271bad995f33db6884b553efe79e9438 (commit)
via d852b332666da212f1ab8667fa044b16eb151717 (commit)
via 70eafe4484d360d936a367434649f0e3dbdb6e11 (commit)
via 035e0beb8cfc1efd2a27836b0a6261010b352bd7 (commit)
via 9f47bd88252e201f9f06fd734dae154d9bc41543 (commit)
via aabf001232fc46ee04cecb3a43fe8c0366a091df (commit)
via 99b32717cd2596ce89a2d46b8cb4ddbba2dea5ad (commit)
from 068db9aaabb0694b4d12404bda16525efad0fde7 (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 a2c9513b1c3449a34f942d8fa53f8ce1fe374e3f
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Jul 12 13:33:51 2017 +0200
Bug 18901: [QA Follow-up] Do not translate zzpref either
Adding one backslash makes a difference :)
We need to escape the dot in the regex to exclude a file like zzpref
from translation too. Perfect_regexes++
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ec51335e9cc4e090ef80f592cc0cc7a0786661f8
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Thu Jul 6 14:39:20 2017 +0200
Bug 18901: Sysprefs translation: translate only *.pref files (not *.pref*)
Text editors can create temporary files in this folder and this can
confuse the translator.
For instance, vim can create a file named '.opac.pref.swp' which will
make the translator dies with the following error message:
Can't use string ("b0VIM 8.0") as a HASH ref while "strict refs" in use
at LangInstaller.pm line 248.
Test plan:
1. echo 'Oops' > .../en/modules/admin/preferences/whatever.pref.whatever
2. cd misc/translator && ./translate update fr-FR
3. Verify that you have the error message mentioned above
4. Apply patch
5. cd misc/translator && ./translate update fr-FR
6. No more errors!
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 441f6fac33975f7e0f7c96b262bc0c0ee3b0c82e
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Wed Jun 7 12:53:52 2017 -0400
Bug 18748: Noisy t/db_dependent/AuthorisedValues.t
This noise is from a failure. This patch expands the delete
to 952$c for the ACQ framework as per comment #5.
TEST PLAN
---------
insert into marc_subfield_structure (tagfield,tagsubfield,liblibrarian, libopac, repeatable, mandatory, kohafield,tab,authorised_value,authtypecode,value_builder,isurl,hidden,frameworkcode,seealso,link,defaultvalue,maxlength) values (952,'c','Shelving location','Shelving location',0,0,'items.location',10,'LOC','','',0,0,'ACQ','','',null,9999);
-- this makes sure you have a pre-existing 952$c ACQ record.
prove t/db_dependent/AuthorisedValues.t
-- should have ugly message like in comment #0
apply patch
prove t/db_dependent/AuthorisedValues.t
-- should be green
run koha qa test tools
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 10d78b9a424d2719c52aa99d3cd642bf7e37e129
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jul 5 16:52:36 2017 -0300
Bug 18262: Fix test in MultiplePerRecord
The biblioitem entry must be added
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit bd3b1c1a33e4bb14bbcd10a0fcf871b39362430d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Mar 13 17:44:25 2017 -0300
Bug 18262: Koha::Biblio - Remove GetBiblioData - part 1
Most of the time C4::Biblio::GetBiblioData is used to retrieve the title
and/or the author of a bibliographic record.
This patch replaces the easy occurrences of GetBiblioData, the ones
where the 2 joins are needed, but only data from biblio and biblioitems
table are.
Test plan:
It will be hard to test everything, I'd suggest a QAer to review this
patch and confirm that the difference occurrences of GetBiblioData have
been correctly replaced by calling Koha::Biblios->find or
$biblio->bibioitem
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 2f1a1fc4b96a91fc054646f91643d8ff46456055
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jul 14 12:19:13 2017 -0300
Bug 18938: (bug 17829 follow-up) Replace 2 occurrences of GetMember left behind
Between patch submission and push, 2 new occurrences appeared in the
codebase.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 313e1f2f271bad995f33db6884b553efe79e9438
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jul 14 08:07:31 2017 +0200
Bug 18880: [QA Follow-up] Finishing touch
Do not fill @return if retval == -1 for LDAP (see cfc484b17).
No need to call store after an DBIx update. Rearranged the if statement.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d852b332666da212f1ab8667fa044b16eb151717
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jul 11 12:24:36 2017 -0300
Bug 18880: Fix authentication fallback for external authentications
A regression in commit cfc484b17 / bug #18314 breaks the local
authentication fallback for all external authentications like LDAP, CAS
and Shibboleth.
The regression itself is a logical error as "@return = (0)" is
considered to be "false" when checked with "unless" (line 1814). That's
wrong as "unless" tests the number of elements in a list.
This patch tries to simplify the logic by adding a $passwd_ok and
$check_internal_as_fallback flags to be more verbose and hopefully more
understandable.
The goal here is simply to restore back the same logic as before cfc484b17
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 70eafe4484d360d936a367434649f0e3dbdb6e11
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jul 14 11:20:28 2017 +0200
Bug 18259: [QA Follow-up] Replace variable name
The variable name has_subscriptions implies that it is a boolean. In reality
we save the number of subscriptions into it. Renaming has_ to cnt_.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 035e0beb8cfc1efd2a27836b0a6261010b352bd7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Mar 13 15:38:54 2017 -0300
Bug 18259: Koha::Biblio - Remove GetSubscriptionsId
C4::Biblio::GetSubscriptionsId can be replaced using
Koha::Biblio->subscriptions
Test plan:
Create a new order for a bibliographic record
Create a new subscription on this biblio
From the basket (acquisition), confirm that you are not able to delete
the order with the biblio ("Can't cancel order and delete catalog record
1 subscription(s) left")
Receive the order
On the parcel page, confirm that you are not able to delete the order
with the biblio
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9f47bd88252e201f9f06fd734dae154d9bc41543
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jul 10 11:56:46 2017 -0300
Bug 18854: Protect few other occurrences of offset
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit aabf001232fc46ee04cecb3a43fe8c0366a091df
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jul 5 10:44:55 2017 -0300
Bug 18854: Make sure offset will not be < 0 - protect from DoS
There was a bug that meant a very large offset in the search params
will cause the search script to run forever (or long enough to crash
the machine)
To test
1/ Get ready with sudo top so you can kill the thread before it causes
your machine to OOM
2/ Hit a page like yourdomain.com/cgi-bin/koha/opac-search.pl?q=1&offset=-9999999999999999999
3/ Notice the process runs for a long time
4/ Kill the process
5/ Apply the patch
6/ Hit the page again, notice the it loads (offset is set to zero)
7/ Do the same to search in the staff client
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 99b32717cd2596ce89a2d46b8cb4ddbba2dea5ad
Author: Chris Cormack <chris at bigballofwax.co.nz>
Date: Sun Jun 25 17:34:12 2017 +1200
Bug 18854 - Protect from DOS
There was a bug that meant a very large offset in the search params
will cause the search script to run forever (or long enough to crash
the machine)
To test
1/ Get ready with sudo top so you can kill the thread before it causes
your machine to OOM
2/ Hit a page like yourdomain.com/cgi-bin/koha/opac-search.pl?q=1&offset=-9999999999999999999
3/ Notice the process runs for a long time
4/ Kill the process
5/ Apply the patch
6/ Hit the page again, notice the it loads (offset is set to zero)
7/ Do the same to search in the staff client
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Amended: changed -2 to 0 in opac-search.pl.
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 41 ++++++++++++---------------
C4/Auth.pm | 38 +++++++++++++++----------
C4/AuthoritiesMarc.pm | 2 +-
C4/Biblio.pm | 32 ++++-----------------
C4/Circulation.pm | 4 +--
C4/HoldsQueue.pm | 4 +--
C4/Reserves.pm | 5 ++--
C4/Search.pm | 1 +
C4/XISBN.pm | 9 +++---
Koha/SearchEngine/Elasticsearch/Search.pm | 4 ++-
acqui/basket.pl | 14 ++++-----
acqui/basketgroup.pl | 5 ++--
acqui/parcel.pl | 8 +++---
admin/auth_subfields_structure.pl | 3 +-
admin/auth_tag_structure.pl | 3 +-
admin/marc_subfields_structure.pl | 3 +-
catalogue/search.pl | 1 +
cataloguing/moveitem.pl | 6 ++--
labels/label-item-search.pl | 1 -
misc/migration_tools/bulkmarcimport.pl | 5 +++-
misc/migration_tools/import_lexile.pl | 16 ++++++-----
misc/translator/LangInstaller.pm | 2 +-
opac/opac-MARCdetail.pl | 5 ++--
opac/opac-addbybiblionumber.pl | 7 +++--
opac/opac-detail.pl | 14 +++++----
opac/opac-issue-note.pl | 12 ++++----
opac/opac-reserve.pl | 4 ++-
opac/opac-review.pl | 6 ++--
opac/opac-search.pl | 3 +-
opac/opac-showreviews.pl | 21 +++++++-------
opac/opac-tags.pl | 8 ++++--
opac/svc/patron_notes | 10 +++----
reserve/request.pl | 20 +++++++------
reviews/reviewswaiting.pl | 5 ++--
serials/serials-edit.pl | 4 +--
serials/subscription-add.pl | 7 +++--
t/db_dependent/AuthorisedValues.t | 2 ++
t/db_dependent/Reserves/MultiplePerRecord.t | 6 ++++
tools/batchMod.pl | 10 +++----
tools/inventory.pl | 8 ++++--
tools/showdiffmarc.pl | 6 ++--
virtualshelves/addbybiblionumber.pl | 7 +++--
42 files changed, 200 insertions(+), 172 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list