[koha-commits] main Koha release repository branch master updated. v18.05.00-249-gb77739e
Git repo owner
gitmaster at git.koha-community.org
Fri Jul 13 15:57:40 CEST 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, master has been updated
via b77739ebc739b3c4fba169ac8e05eb263495f7ec (commit)
via 07c6699a7bd4204d002f135bfeddf33fcc831b54 (commit)
via 3dd378fa18230f7a428a309b53e465205b2a235e (commit)
via 5995275b74777432c5ac3b26bf5016e6a27cfcf5 (commit)
via 14f818edf6a0690a39793b2e6cad0204171be375 (commit)
via 301c36b8292b6c40390dff79393ac0fd79c7960f (commit)
via 94b2b6c4f946f4f43e6255cb582fc272c85d8872 (commit)
via 1563ec38132ec687c714a5b64489d79e8c02476a (commit)
via cfca339d03777d4404153224a312012a6b89392d (commit)
via 24dd595e0d4e168f6ac26f21e6d961dabff6f3e9 (commit)
via 7d45e88dde1e67bedf02a42daed9d7e7662df353 (commit)
via d8d54d874a0c0764d42793a2f71d346c9c563d5a (commit)
via 082583327e58e65ac595f998669b5c0262aef644 (commit)
via ddf6e6f246cacd30e9bfbbb2f7ffd8c061c9ed15 (commit)
via 1ac0b87674a5770aaf536d2ad8d15e2b7b2a7c80 (commit)
via 5bf6acac7342d32e0229ee573f4a7f156c99259d (commit)
via ff8e46c42c9949d05a87745cdb36baec2048b864 (commit)
via dbdd85ee1ebd99e4c8084664b4a7a9bb9ef34d74 (commit)
from 9bfb3bc3782dd6b516d0144074b57e55cbefae2e (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 b77739ebc739b3c4fba169ac8e05eb263495f7ec
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Jun 29 11:15:22 2018 -0300
Bug 21022: (follow-up) Move overloaded full_message method to subclass
We shouldn't have it overloaded on the base class, as it could get huge
and difficult to find things, and read.
This patch moves things to Koha::Exceptions::Object. We should overload
the full_message method on each exceptions class, as needed.
To test:
- Run:
$ kshell
k$ prove t/Koha/Exceptions.t
=> SUCCESS: Tests still pass!
- Sign off :-D
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 07c6699a7bd4204d002f135bfeddf33fcc831b54
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Jun 29 11:02:57 2018 -0300
Bug 21022: Use passed message if present
This patch makes 'full_message' use the passed exception message instead
of trying to build it from the parameters. This is particularly useful
for some situations in which we don't have all the information but would
like to keep using the same exception.
To test:
- Apply this patchset
- Run:
$ kshell
k$ prove t/Koha/Exceptions.t
=> SUCCESS: Tests pass!
- Sign off
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 3dd378fa18230f7a428a309b53e465205b2a235e
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Jun 29 11:02:40 2018 -0300
Bug 21022: Unit tests
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 5995275b74777432c5ac3b26bf5016e6a27cfcf5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jun 28 11:00:57 2018 -0300
Bug 21008: Use Koha::Patron->is_child
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Edit: I removed the category parameter as it is not really used.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 14f818edf6a0690a39793b2e6cad0204171be375
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Jun 28 10:31:30 2018 -0300
Bug 21008: Use patron object to get category_type
This patch makes borrower_add_additional_fields() in both pay.pl and
paycollect.pl use the right object to pick the category_type.
It also populates the extendedattributes template variable in pay.pl
which was missed by a change.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 301c36b8292b6c40390dff79393ac0fd79c7960f
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu May 24 18:51:03 2018 +0000
Bug 20814: Display issue with 'Saved reports' tabs when memcached is off
This patch changes the configuration of the saved reports table so that
columns which were previously excluded from the table altogether are now
hidden. This prevents a JavaScript error when DataTables tries to
reference a missing column.
To test, apply the patch and go to Reports -> Use saved. You should have
at least one report category configured and assigned to reports in order
for the tabs display to be visible.
Test the table of saved reports under a variety of these circumstances:
- memcached disabled or enabled
- reports exist or don't exist which require update from the old
marcxml syntax
- cache_expiry and/or update columns are configured in Administration
-> Columns settings to be shown or hidden
The report category tabs and the table should render correctly under all
circumstances.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 94b2b6c4f946f4f43e6255cb582fc272c85d8872
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed May 23 12:43:55 2018 +0000
Bug 20805: Update child to adult patron process broken on several patron-related pages
This patch fixes a problem with several patron-related pages, where the
"Update child to adult patron" menu item doesn't work. With some pages,
the right category information wasn't being passed from the script to
the template. With some, the right JavaScript variable weren't being
passed from the template to the included JavaScript file.
To test, apply the patch locate some patrons with "child" type patron
categories. With each patron, go to one of the following pages and test
the "update child" process in the toolbar's "More" menu.
- Circulation ->
- Batch check out
- Notices
- Statistics
- Files
- Housebound
- Delete (test from the deletion confirmation screen).
All test should be performed on a system with multiple adult patron
categories configured AND on a system with only a single adult patron
category.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 1563ec38132ec687c714a5b64489d79e8c02476a
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri May 25 09:32:58 2018 +0000
Bug 18822: Check if we have MARC::Record and convert if not when using ES
The new_record_from_zebra subroutine assumes that when using ES we
always get MARC::Record objects when using ES, but sometimes we get them as xml via Z39 or
internally. This adds a test to new_from_zebra to confirm we have a
record object and to convert it if not
To test:
1 - Perform an advanced search from the advanced editor, make sure to
select 'Local catalog' and a remote source
2 - Error 'Internal search error [Object object]'
3 - Apply patch
4 - Repeat search, success!
5 - Select and deselect various servers, search should still work
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit cfca339d03777d4404153224a312012a6b89392d
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Jun 19 11:21:41 2017 -0400
Bug 18822: Better error response
Apply this patch first to see a change in the error feedback - instead
of [Object object] you should get a text readable error
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 24dd595e0d4e168f6ac26f21e6d961dabff6f3e9
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Jul 2 10:41:24 2018 +0200
Bug 20900: Add CPL branch in t_Batch.t too
Same fix as previous patch.
Test plan:
Run t/db_dependent/Labels/t_Batch.t (without CPL branch)
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7d45e88dde1e67bedf02a42daed9d7e7662df353
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jun 8 10:56:10 2018 +0200
Bug 20900: Add CPL test branch in rollingloans.t
Trivial fix.
Test plan:
Without this patch and a CPL library, run rollingsloans.t. See warns.
With this patch, no warns.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit d8d54d874a0c0764d42793a2f71d346c9c563d5a
Author: Charles Farmer <charles.farmer at inLibro.com>
Date: Fri Jun 29 16:12:59 2018 -0400
Bug 21025: Add GetPreparedLetter to Koha::Patron::Discharge
Test plan (shamelessly ripped from Bug20953):
1) Set system preference 'useDischarge' to 'Allow'
2) Choose a patron without checkouts nor fines nor restrictions
3) Log at OPAC and go to patron page /cgi-bin/koha/opac-user.pl
4) Click on 'ask for a discharge' tab
=> You see /cgi-bin/koha/opac-discharge.pl
with text 'What is a discharge? ...'
5) Click on 'Ask for a discharge' link
=> You see /cgi-bin/koha/opac-discharge.pl?op=request
with text 'Your discharge request has been sent ...'
6) In a new browser tab/page, go to intranet on /cgi-bin/koha/members/discharges.pl
=> You see one discharge requets for the patron
=> Click on 'allow' on patron discharge request
7) Come back to OPAC and refresh /cgi-bin/koha/opac-discharge.pl
=> You see link 'Get your discharge'
8) Click on the link to get your generated PDF
=> An error message should appear informing you to contact your website's admin
9) Apply this patch
10) Click again on the link to get your generated PDF
=> This time, a download prompt should appear
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 082583327e58e65ac595f998669b5c0262aef644
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Jun 18 15:29:37 2018 +0000
Bug 20698: Remove obsolete template: transfer-slip.tt
This patch removes an unused template file, circ/transfer-slip.tt. Its
use was removed by Bug 7001:
http://git.koha-community.org/gitweb/?p=koha.git;a=commitdiff;h=a9ded4fa008668df8c485fbbc76efa3cc9cc00d7#patch12
To test, apply the patch and confirm that the file has been removed.
Confirm that no references to the template exist in the codebase.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ddf6e6f246cacd30e9bfbbb2f7ffd8c061c9ed15
Author: Pasi Kallinen <pasi.kallinen at joensuu.fi>
Date: Mon Mar 5 12:10:56 2018 +0200
Bug 20332: Allow translating some grouped opac results texts
The grouped OPAC results page has several untranslatable
javascript-added texts, including the selection modifiers "Clear all"
and "Select all" links, and the entries in the shelves/lists dropdown.
Compare to opac-results.tt
Signed-off-by: Pasi Kallinen <pasi.kallinen at joensuu.fi>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 1ac0b87674a5770aaf536d2ad8d15e2b7b2a7c80
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jul 13 11:48:42 2018 +0000
Bug 20090: (RM follow-up) Add missing paren
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 5bf6acac7342d32e0229ee573f4a7f156c99259d
Author: David Kuhn <techservspec at gmail.com>
Date: Thu Jan 25 09:27:19 2018 -0800
Bug 20090: Missing script statement for Novelist Select on some record displays in OPAC
This patch adds a check for UPCs and well as ISBNs to the Novelist Select conditionals in opac-detail.tt
To test (note that you must subscribe to Novelist Select):
1. If your library does not use the raton ratings feature, activate it for the purposes of this test.
2. Display a record that does not have an ISBN in the 020 field, but has a upc (or other code) in the 024 field. The rating option will
display as 5 radio buttons and a "rate it" button.
3. Apply the patch.
4. Display the same record again. The radio buttons will be replaced with stars. This indicates that the scripts on the page completed.
Rather that using the patron ratings as in indicator, you can also use a web page inspector/debugger such as firebug or the built-in
inspectors in most newer browsers to check for script errors.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
I couldn't check with Novelist Select, but read and checked changed made carefully.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ff8e46c42c9949d05a87745cdb36baec2048b864
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Jun 29 11:52:16 2018 -0300
Bug 21023: Remove warning in t/db_dependent/Circulation/Chargelostitem.t
To test:
- Run:
$ kshell
k$ prove t/db_dependent/Circulation/Chargelostitem.t
=> FAIL: Warning is displayed
- Apply this patch
- Run:
k$ prove t/db_dependent/Circulation/Chargelostitem.t
=> SUCCESS: Tests pass! No warning!
- Sign off :-D
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit dbdd85ee1ebd99e4c8084664b4a7a9bb9ef34d74
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Jul 4 16:03:33 2018 +0200
Bug 14446: Workaround to resolve uninitialized value in goto warning
Forcing both GetTab calls to list context resolves the warning.
A workaround, not a real fix.
Test plan:
Search for something in the syspref text bar.
Without this patch, you will have a warn: Use of uninitialized value in goto
With this patch, you won't.
Signed-off-by: Aleisha Amohia <aleishaamohia at hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Search.pm | 2 +-
Koha/Exceptions/Exception.pm | 13 ----
Koha/Exceptions/Object.pm | 67 ++++++++++++++++++++
Koha/Patron/Discharge.pm | 1 +
admin/preferences.pl | 3 +-
.../prog/en/includes/cateditor-ui.inc | 2 +-
.../en/modules/circ/circulation_batch_checkouts.tt | 13 ++++
.../prog/en/modules/circ/transfer-slip.tt | 25 --------
.../prog/en/modules/members/deletemem.tt | 11 ++++
.../prog/en/modules/members/housebound.tt | 13 +++-
.../prog/en/modules/members/notices.tt | 13 +++-
.../en/modules/reports/guided_reports_start.tt | 19 ++++--
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 9 +--
.../bootstrap/en/modules/opac-results-grouped.tt | 6 +-
members/deletemem.pl | 7 ++
members/files.pl | 7 ++
members/housebound.pl | 6 ++
members/notices.pl | 10 ++-
members/pay.pl | 9 +--
members/paycollect.pl | 9 +--
members/statistics.pl | 7 ++
t/Koha/Exceptions.t | 7 +-
t/db_dependent/Circulation/Chargelostitem.t | 8 +--
t/db_dependent/Labels/t_Batch.t | 10 ++-
t/db_dependent/rollingloans.t | 6 +-
25 files changed, 210 insertions(+), 73 deletions(-)
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfer-slip.tt
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list