[koha-commits] main Koha release repository branch 17.05.x updated. v17.05.08-53-gd4897d2
Git repo owner
gitmaster at git.koha-community.org
Fri Feb 9 09:22:33 CET 2018
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, 17.05.x has been updated
via d4897d2d6abfe6943ff8bdaae53cfb8b5a162876 (commit)
via 8fdbaee0e4678a3e5d3f9a64ee6bb5d6ba9118ea (commit)
via c2d7c71c91bf5b3579abdca5937ddb0c611aaca8 (commit)
via 4177b81d49d27720f7a2b67d1b3a3524d8d78db5 (commit)
from 1f34c499c8bedc260eb07930d59caa97f03f1736 (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 d4897d2d6abfe6943ff8bdaae53cfb8b5a162876
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jan 22 17:04:28 2018 -0300
Bug 19975: Fix search by tags at the OPAC
This bug has certainly be caused by
commit 091d6c513bcbee224ff06477e79be48cea7fe825
Bug 17843: Replace C4::Koha::getitemtypeinfo with Koha::ItemTypes
The reason is quite simple, in Koha::ItemType->translated_description
(called in opac-search.pl l.229) there is an eval to know if we have
access to the translated description of the item type, to avoid
retrieving it again.
The evaluation of $@ later in opac-search.pl is supposed to test the 2
eval made few lines before (a "normal" search, without tags), but
$@ contains the error message from the *last* eval command.
So we are raising an error that have been correctly handled in
Koha::ItemType.
Test plan:
At the OPAC, click Tag cloud, then click any of the tags
=> Without the patch you get
Koha::ItemType::get_column generated this error: DBIx::Class::Row::get_column(): No such column 'translated_description' on Koha::Schema::Result::Itemtype at /usr/share/koha/lib/Koha/Object.pm line 307
=> With the patch applied the page is correctly displayed
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
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: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit fc172d3252b8587006f7d6b4d747ce2b339ea803)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 8fdbaee0e4678a3e5d3f9a64ee6bb5d6ba9118ea
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jan 22 17:18:59 2018 -0300
Bug 19985: Make TestBuilder.t pass even if default_circ_rules is not empty
This table cannot contain more than 1 row, so we need to remove its data
before trying to generate a new entry.
Test plan:
Set a default circ rule
prove t/db_dependent/TestBuilder.t
should return green
Without this patch you get:
# Failed test 'TestBuilder should be able to create an object for every source'
# at t/db_dependent/TestBuilder.t line 78.
# got: '1'
# expected: '0'
# The following sources have not been generated correctly: DefaultCircRule
# Looks like you failed 1 test of 1.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 55d8ea59e7964d05ffb68e7bfcf14d6556ed8739)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit c2d7c71c91bf5b3579abdca5937ddb0c611aaca8
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon May 8 16:47:06 2017 +0000
Bug 18477: Populate article_requests table values for AR_PENDING notices
The default AR_PENDING letter does not print populate <<article_requests.*>> fields.
Test Plan:
1) Enable article requests ( syspref: ArticleRequests => Enable, Circ and fine rules ALL/ALL (or a given category/itemtype): Article requests => Yes )
2) Search for a title, click in to catalog detail, click 'Request Article' button.
3) Select Patron
4) Fill out request information
5) Click 'Place request'
6) Go to notices in patron record, inspect 'Article Request Received' notice. You should see the request information from step 4, but it doesn't display.
7) Apply this patch
8) Repeat steps 2-6, not the fields now display!
Signed-off-by: Eric Phetteplace <phette23 at gmail.com>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit e1a61134eb921760ebe3ac992a151591bb3977bf)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 4177b81d49d27720f7a2b67d1b3a3524d8d78db5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jan 2 14:36:43 2018 -0300
Bug 18477: Add tests
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 2a0423778e73467beeb57379db49b49b811894aa)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
-----------------------------------------------------------------------
Summary of changes:
Koha/ArticleRequest.pm | 1 +
opac/opac-search.pl | 2 +-
t/db_dependent/ArticleRequests.t | 25 +++++++++++++++++++++++--
t/db_dependent/TestBuilder.t | 1 +
4 files changed, 26 insertions(+), 3 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list