lp://staging/~chris-bigballofwax/koha/master

Branch merges

This import branch has no branches proposed for merge into it.

No branches dependent on this one.

Related source package recipes

1 recipe using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

27403. By Tomas Cohen Arazi <email address hidden> on 2018-07-13

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 <email address hidden>

Signed-off-by: Jonathan Druart <email address hidden>

Signed-off-by: Nick Clemens <email address hidden>

27402. By Tomas Cohen Arazi <email address hidden> on 2018-07-13

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 <email address hidden>

Signed-off-by: Jonathan Druart <email address hidden>

Signed-off-by: Nick Clemens <email address hidden>

27401. By Tomas Cohen Arazi <email address hidden> on 2018-07-13

Bug 21022: Unit tests

Signed-off-by: Martin Renvoize <email address hidden>

Signed-off-by: Jonathan Druart <email address hidden>

Signed-off-by: Nick Clemens <email address hidden>

27400. By Jonathan Druart <email address hidden> on 2018-07-13

Bug 21008: Use Koha::Patron->is_child

Signed-off-by: Tomas Cohen Arazi <email address hidden>
Edit: I removed the category parameter as it is not really used.

Signed-off-by: Katrin Fischer <email address hidden>

Signed-off-by: Jonathan Druart <email address hidden>

Signed-off-by: Nick Clemens <email address hidden>

27399. By Tomas Cohen Arazi <email address hidden> on 2018-07-13

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 <email address hidden>

Signed-off-by: Jonathan Druart <email address hidden>

Signed-off-by: Nick Clemens <email address hidden>

27398. By Owen Leonard on 2018-07-13

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 <email address hidden>

Signed-off-by: Marcel de Rooy <email address hidden>

Signed-off-by: Nick Clemens <email address hidden>

27397. By Owen Leonard on 2018-07-13

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 <email address hidden>

Signed-off-by: Marcel de Rooy <email address hidden>

Signed-off-by: Nick Clemens <email address hidden>

27396. By Nick Clemens <email address hidden> on 2018-07-13

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 <email address hidden>

Signed-off-by: Marcel de Rooy <email address hidden>

Signed-off-by: Nick Clemens <email address hidden>

27395. By Nick Clemens <email address hidden> on 2018-07-13

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 <email address hidden>

Signed-off-by: Katrin Fischer <email address hidden>

Signed-off-by: Marcel de Rooy <email address hidden>

Signed-off-by: Nick Clemens <email address hidden>

27394. By Marcel de Rooy <email address hidden> on 2018-07-13

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 <email address hidden>

Signed-off-by: Katrin Fischer <email address hidden>

Signed-off-by: Nick Clemens <email address hidden>