Commit Graph

32098 Commits

Author SHA1 Message Date
Jonathan Druart 28a404bc31
Bug 21353: (follow-up) same check for select/clear all links
Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr>
Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit bf908a5f07)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-27 13:24:36 +01:00
Jonathan Druart ffbd4d22e1
Bug 21353: Display checkboxes to merge patron even if cannot manage lists
When permission 'manage_patron_lists' is off, there is no checkbox on
/cgi-bin/koha/members/member.pl to merge patrons.

Test plan:
Remove permission manage_patron_lists
Add permission edit_borrowers
Search for patrons
=> Without this patch you will not be able to select patrons to merge
(checkboxes are not displayed)

Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit d60b0a2e4d)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-27 13:24:09 +01:00
Jonathan Druart c088efd6c9
Bug 21323: Handle multi params in redirect after login
Multi params are not handle correctly after login

Test plan:
[0] Use staff interface
[1] Use advance search and tick itemtype more than one checkbox
[2] Copy result url
[3] Logout
[4] Paste url in browser
[5] Type username and password
[6] In search result page, results limit description under breadcrumbs
will show all limits

Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr>
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit c6a26d2c9e)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-27 13:22:07 +01:00
Owen Leonard 0a027c846f
Bug 20223: Merge members-menu and circ-menu inc files
This patch removes members-menu.inc and replaces the last functional use
of it with a call to circ-menu.inc.

An invalid use of members-menu.inc has been removed from member.tt.

To test, apply the patch and open a patron record for editing. The
sidebar menu should look correct and all sidebar links should work
correctly.

View the patrons home page and confirm that nothing has broken.

Search the Koha codebase for references to members-menu.inc. There
should be none.

Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit fb5b377ffd)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-27 13:20:21 +01:00
Marcel de Rooy 75b0e7a078
Bug 21281: (QA follow-up) Introduce _add_backtics
Added a (initially trivial) test in Creators/Lib.t too.
Sometimes you start something, but you end somewhere else ;)

The test seems a bit slower now (regex, lookahead, etc). But this should
not hurt label creators in daily use.
Advantages: code is even more solid, consolidated in one place and can be
tested on its own.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit db683b285c)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-27 13:08:15 +01:00
Mark Tompsett a54c1b9a1c
Bug 21281: Correct t/db_dependent/Creators/Lib.t failures
TEST PLAN
---------
1) apply first patch
2) kshell kohadev
3) prove -r -v t/db_dependent/Creators/
   -- failures
4) apply this patch
5) repeat 2,3
   -- no failures
6) run koha qa test tools

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

(cherry picked from commit 78124100ec)

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-27 13:07:52 +01:00
Jonathan Druart 9f30689888
Bug 21281: Surround creator_templates.rows with backquotes
'rows' is a reserved word since MariaDB 10.2.4 and MySQL
https://mariadb.com/kb/en/library/mariadb-1024-release-notes/
https://dev.mysql.com/doc/refman/8.0/en/keywords.html

Test plan:
Do not apply this patch and make sure you recreate the reported issue
Apply this patch and confirm that it is now fixed.

QA will take care for the changes in installer and test files

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 7de47202f2)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-27 13:07:29 +01:00
Nick Clemens ff32389927
Bug 20656: (RM follow-up) Add missing filter
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 87dc160555)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-25 14:34:23 +01:00
Nick Clemens be132fe428
Bug 20656: (follow-up) Don't display title for F or FU fines (it is in description)
Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit cdfc1c08c9)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-25 14:33:55 +01:00
Nick Clemens 3199778b5c
Bug 20656: Better formatting for print summary
This patch is a slightly edited c&p from boraccount.tt

1 - Manually add a credit with no notes to patron
2 - Print summary
3 - Inspect the line
4 - Note that td has extra newlines and no words
5 - Apply patch
6 - Print summary again
7 - Note better formatting

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 4df6a3ef79)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-25 14:32:37 +01:00
Nick Clemens fd13428bc5
Bug 20656: Don't print lines that have no balance on print summary
To test:
1 - Add at least two fines to a patron
2 - Pay off one of them
3 - Print summary - all 3 lines show
4 - Apply patch
5 - Print summary - only line with balance shows

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 0fd329724b)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-25 14:28:14 +01:00
Martin Renvoize 41130848be
Update release notes for 18.05.04 release
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-24 14:15:21 +01:00
Martin Renvoize f444e82e99
Increment version for 18.05.04 release
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-24 14:08:31 +01:00
Koha translators fb8a522ab4
Translation updates for Koha 18.05.04
(cherry picked from commit c507d41d32b8652d51114b3784abd01051304c0d)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-24 13:54:39 +01:00
Tomas Cohen Arazi 2cec62128c
Bug 21334: Add bibliographic content type definitions
This patch adds the following content type definitions, to be used by
endpoint authors implementing MARC-related endpoints:

--------------------------------------
| Content-type             | Alias   |
|--------------------------|---------|
| application/marcxml+xml  | marcxml |
| application/marc-in-json | mij     |
| application/marc         | marc    |
--------------------------------------

Code using this aliases will use them like this:
- Suppose you want to output data in MARCXML format:

my $record = cool_method_that_returns_MARC_RECORD();
return $c->render( status => 200, format => 'marcxml', text => $record->as_xml_record );

Note: 'text' by defaults encodes output as UTF-8. If the encoding is not
UTF-8 you should encode the data on your own.

To test:
- Apply this patches
- Run:
  $ kshell
 k$ prove t/db_dependent/Koha/REST/V1.t
=> SUCCESS: Test pass!
- Sign off :-D

Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

(cherry picked from commit b612ec7a0d)

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-20 15:02:31 +01:00
Tomas Cohen Arazi bbd86576ff
Bug 21334: Unit tests
This patch adds unit tests for the new content types being added.
It also adds tests for the 'json' overloading that already takes place
in V1.pm.

Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 1442499a0b)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-20 15:02:19 +01:00
Tomas Cohen Arazi ab79f3fc67
Bug 21116: Add API routes through plugins
This patch adds plugins the capability of injecting new routes on the
API.

The plugins should provide the following methods to be considered valid API-generating plugins:

- 'api_routes': returning the 'path' component of the OpenAPI specification corresponding to the routes served by the plugin
- 'api_namespace': it should return a namespace to be used for grouping the endpoints provided by the plugin

otherwise, they will be just skipped.

All plugin-generated routes will be added the 'contrib' namespace, and
will end up placed inside /contrib/<namespace>, where <namespace> is what the 'api_namespace' returns.

A sample endpoint will be added to the Kitchen Sink plugin, and tests
are being written.

To test:
- Apply this patches
- Run:
  $ kshell
 k$ prove t/db_dependent/Koha/REST/Plugin/PluginRoutes.t
=> SUCCESS: Tests pass!
- Install the (latest) KitchenSink plugin
- Point your browser to the API like this:
  http://koha-intra.myDNSname.org:8081/api/v1/.html
=> SUCCESS: The /contrib/kitchensink/patrons/:patron_id/bother endpoint
implemented by the plugin has been merged!
- Sign off! :-D

Signed-off-by: Benjamin Rokseth <benjamin.rokseth@deichman.no>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 3fedae85f2)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-20 12:09:27 +01:00
Tomas Cohen Arazi f243f8f012
Bug 21116: Unit tests
This path implements unit tests for the route-from-plugin development.
It adds the required methods to the Koha::Plugin::Test plugin
distributed along with the tests. A second plugin implementing invalid
OpenAPI specs is added (Koha::Plugin::BadAPIRoute).

Edit: I made terminology changes to make it less rude.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 46c992948e)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-20 12:09:14 +01:00
Nick Clemens 0f45f3afdf
Bug 20564: Don't use system to unzip files
To test:
1 - Setup a zip file for patron images and cover images
2 - Test each tool
3 - Get a '500 error' after upload (note images do upload and attach)
4 - Apply patch
5 - Restart all the things
6 - Test agtain, uploads should complete and results display

Signed-off-by: George Williams <george@nekls.org>

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 8b806227c1)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-20 12:07:17 +01:00
Nick Clemens 2e8f370f26
Bug 7143: Update about page for new dev - Jane Sandberg
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit a389c751cb)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-20 12:05:37 +01:00
Martin Renvoize a532ce2d13
Bug 7143: Update history to reflect recent point releases
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit a302fc8d78)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-20 12:04:43 +01:00
Nick Clemens ead5617f92
Bug 13406: (RM follow-up) Add missing filter
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit a299ae3a84)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-20 11:57:41 +01:00
Jane Sandberg cd786a9c4d
Bug 13406: (follow-up) Add styling classes to authority MARC detail display
Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
Amended patch: replace tab characters with spaces

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 65cbeae78c)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-20 11:57:09 +01:00
Jane Sandberg 4881ecece5
Bug 13406: Add styling classes to authority MARC detail display
When viewing authority MARC records in the staff client (detail view), the
MARC tags were not displaying with the tag_num, tag_desc, tag_ind1,
tag_ind2, and desc classes, which made it impossible to add styles
to these specific parts of a MARC tag.  This commit adds these
styles (which are the same as the classes in the bibliographic
MARC detail display).

To test:
1) Open the staff client, then click Authorities.
2) Search for an authority record.
3) Click on Details.
4) Examine some MARC fields.  Note that the entire tag title line
is in a single <div>.
5) Apply this commit.
6) Repeat steps 1-3.
7) Notice that the tag title line is now separated into several
spans, each with their own classes.

Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 05e51e9574)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-20 11:56:39 +01:00
Owen Leonard 145eef6a90
Bug 13692: series link is taking you to just 800a instead of whole 800
This patch modifies the OPAC and staff client's XSL template for the
detail page so that series links based on a traced 490 tag use both
author and series title from the 800 tag.

To test you should have multiple titles in the same series with matching
490 and 800 tags in each record. Apply the patch and restart Plack if
necessary.

View the detail page for one of the series' titles. The "Series:" link
should link to a search which uses both series title and author.
Clicking the link should return the correct results.

Test both the OPAC and staff client.

Signed-off-by: John Sterbenz <jsterben@umich.edu>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit cf5a924618)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-17 15:38:27 +01:00
Caroline Cyr La Rose c82595a4fa
Bug 21356: Add Missing space in parcel.tt
This patch adds a space between the user's name and 'On:'
in parcel.tt.

To test:

1) Go to Acquisitions
2) Search for a vendor
3) Create a new basket
4) Add an order to the basket
5) Close the basket
6) Receive the order
7) In the page title 'Receipt summary' notice there is no space
between the 'Received by' user name and 'On:'
8) Apply the patch
9) Refresh the page, there should now be a space

Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit d56c19138c)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-17 15:34:17 +01:00
Nick Clemens ad16c9f5b2
Bug 21262: Do not format numbers for editing if too big
This patch copies the code from bug 15770 to the format_for_editing
sub.

It also corrects schema issue, listing the purpose for two acq columns
instead of claing unused

To test:
1 - Edit a fund
2 - Set warning at amount to: 100000000000000
3 - Save budget
4 - Try to edit - internal server error
5 - Apply patch
6 - Should be able to edit budget
7 - Number should appear unformatted

Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2 quick notes:
1. Code must be moved to a subroutine if reused later
2. It would have prefered to have the comment of the 2 DB columns on a separate patch
(even separate bug report). As it's minor and that the patch will certainly backported
I will not block it.

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 7a84297ac4)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-17 15:33:18 +01:00
Jonathan Druart c28d8f0600
Bug 21360: Prevent IssueSlip.t to fail when run at 23:59
Not sure what happened on bug 15029 (Make the IssueSlip tests pass even if
launched after 23:00) but we should have tested with 23:59, not 23:50...

koha_1       |     # Looks like you planned 3 tests but ran 2.
koha_1       |
koha_1       | #   Failed test 'Issue slip'
koha_1       | #   at t/db_dependent/Members/IssueSlip.t line 294.
koha_1       | Label not found for "last SKIP" at /usr/share/perl5/Test/More.pm line 1370.
koha_1       | # Looks like your test exited with 255 just after 1.
koha_1       | [23:59:10] t/db_dependent/Members/IssueSlip.t
koha_1       | Dubious, test returned 255 (wstat 65280, 0xff00)
koha_1       | Failed 3/3 subtests

Test plan:
0/ Don't apply this patch
1/ sudo date -s "2018-09-15 23:59:00";prove t/db_dependent/Members/IssueSlip.t
=> You should get the error
2/ Apply this patch and repeat 1.
=> Tests should pass now!

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 60788555b3)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-17 15:31:14 +01:00
Nick Clemens 9659b2f447
Bug 20777: DBRev 18.05.03.003
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 2847ac4b4d)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-17 15:28:53 +01:00
Tomas Cohen Arazi 6fe2ebd1e4
Bug 20777: (follow-up) Remove 'dispute' reference in /credits endpoint
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 2d94834807)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-17 15:26:55 +01:00
Tomas Cohen Arazi b2bfea26a7
Bug 20777: DBIC update
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit b64f1808f1)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-17 15:26:31 +01:00
Tomas Cohen Arazi d3d43360b0
Bug 20777: Remove unused accountlines.dispute field
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit f9359675e2)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-17 15:26:02 +01:00
Nick Clemens 44ce16d006
Bug 21288: DBRev 18.05.03.002
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 11e513f83f)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-17 14:58:49 +01:00
Pasi Kallinen 40536fedd3
Bug 21288: Slowness in acquisition caused by GetInvoices
The SQL query done by GetInvoices is quite slow on our production server,
taking about a minute.

In the query, there's this join:

  LEFT JOIN subscription ON biblio.biblionumber = subscription.biblionumber

but there's no index on subscription.biblionumber. Adding the index speeds
up the query so it only takes up about 3 seconds.

Signed-off-by: Pasi Kallinen <pasi.kallinen@joensuu.fi>

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit cb406f72b0)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-17 14:56:22 +01:00
Fridolin Somers 06f0209840
Bug 20765: Fix search for items by acqdate in label batch
In Tools >  Label creator, when creating a batch you can add items using a search.

This search has filters on acquisition date.
Actually those filters does not work.
The create a search using CCL syntaxe to query Zebra search engine.

The cause is that operator "ge" or "le" must be before "st-date-normalized" in CCL query.
Looks like it is because of "st-date-normalized" uses "r=o" in ccl.properties.

Test plan :
1) Check in advance search you have indexed acquisition date
2) Go to Tools > Label creator
3) Click on New > Label batch
4) Click on Add item(s)
5) Enter a relevent date in "Added on or after date" and in "Added on or before date"
6) Click on "Search"
=> SUCCESS: You get results
7) Apply the patch
8) Retry the 'Add item(s)' step
=> SUCCESS: Patch doesn't change behaviour for old Zebra
9) Get rid of the patch on your working branch
10) Use the latest Zebra:
- /etc/apt/sources.list.d/indexdata.list:
deb http://ftp.indexdata.dk/debian jessie main
- Add the repo key:
  $ wget http://ftp.indexdata.dk/debian/indexdata.asc -O- | sudo apt-key add -
- Upgrade:
  $ sudo apt update; sudo apt dist-upgrade
  $ sudo koha-rebuild-zebra -f -a -b -v kohadev
  $ restart_all
11) Retry the 'Add item(s)' step
=> FAIL: No results!
9) Apply the patch, retry
=> SUCCESS: Search results!
- Sign off :-D

Signed-off-by: Maryse Simard <maryse.simard@inlibro.com>
Followed the test plan and it works.
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
It doesn't break with 2.0.59-1 (stretch/jessie), and fixes the problem
for 2.1.X.

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit a6f8eac4ed)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-17 14:54:42 +01:00
Jonathan Druart b8b006fd73
Bug 21355: Prevent GetDailyQuote.t to fail when run after 23:00
Tests will fail (Jenkins run #554) if run after 23:00

 #   Failed test 'Id is correct'
 #   at t/db_dependent/Koha/GetDailyQuote.t line 72.
 #          got: 6
 #     expected: 8

 #   Failed test 'Timestamp 2018-09-15 00:44:46 is correct'
 #   at t/db_dependent/Koha/GetDailyQuote.t line 74.
 #          got: '2018-09-14 23:44:46'
 #     expected: '2018-09-15 00:44:46'
 # Looks like you failed 2 tests of 12.
 [23:44:46] t/db_dependent/Koha/GetDailyQuote.t
 Dubious, test returned 2 (wstat 512, 0x200)

Adding only 1 second will hugely reduce the risk of failure here.

It also updates a useless test (column 'quote' does not exist)

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Tested:
- Run:
  $ sudo date -s 2018-09-15T23:10:00
  $ kshell
 k$ prove t/db_dependent/Koha/GetDailyQuote.t
=> FAIL: Tests fail as patch author mentions
- Apply the patch
 k$ prove t/db_dependent/Koha/GetDailyQuote.t
=> SUCCESS: Tests pass!

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit ca887754ea)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-17 14:53:19 +01:00
Marcel de Rooy 31db0813d3
Bug 19179: (QA follow-up) Replace second E-mail
Better write here exactly what we need to type in the pref text box.
Since E-mail will not work and Email will :)

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit b0ef7174fe)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-17 14:45:15 +01:00
Charlotte Cordwell 9f221f9ae8
Bug 19179: Email option for SMSSendDriver is not documented
'Email' is not documented as a valid setting.

1) Apply patch.
2) Go to Administration --> search SMSSendDriver
3) Check if SMSSendDriver has this message is at the end of the box:
   "If you would prefer to receive SMS via E-mail set SMSSendDriver to Email"

Signed-off-by:  Michal Denar <black23@gmail.coml>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 2d6cf8bd7a)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-17 14:44:16 +01:00
Owen Leonard 903b880f33
Bug 21127: Remove jqTransform jQuery plugin from the OPAC
This patch removes the jqTransform jQuery plugin from the OPAC. It was
added for the CCSR theme, which no longer exists.

http://git.koha-community.org/gitweb/?p=koha.git;a=commit;h=c7c2e9efbde273f2b77786316b7502a8847072bd

There will be no visible changes to the OPAC after applying the patch.
Search the Koha codebase for references to jqTransform and confirm that
none exist.

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 83e515820a)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-17 14:31:30 +01:00
Pasi Kallinen 7fe692bf0e
Bug 21248: Fix COinS carp in MARC details page on unknown record
Looking up a nonexistent record in the MARC details -page causes
the COinS to carp. The fix is trivial, just move the COinS call
couple lines, after the record existence check.

TEST PLAN
---------
1) reset_all for kohadevbox
2) log in to staff client - admin/admin
3) search catalogue for green
4) tweak the top URL to have a bad biblionumber (eg. 9999)
5) cat /var/log/koha/kohadev/plack-err.log
   -- floody! with errors.
6) echo | sudo tee /var/log/koha/kohadev/plack-err.log
7) restart_all
8) repeat steps 2 through 5.
   -- just nice starting messages, not floody.
9) run koha qa test tools

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

(cherry picked from commit 030047da42)

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-17 14:30:27 +01:00
Marcel de Rooy ee2d5ae04d
Bug 13779: (QA follow-up) Correct checkauth call in offline_circ/download.pl
Script offline_circ/download.pl does not use the return values of
checkauth. So should not assign them to bad chosen variables that do
not correspond with checkauth but with get_template_and_user.

Test plan:
Look for $template, $loggedinuser, $cookie, $flags in the code.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit bf7082f854)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-17 14:27:25 +01:00
David Cook 89f6aacecc
Bug 13779: sessionID declared twice in C4::Auth::checkauth()
The bug is that $sessionID is declared twice in C4::Auth::checkauth().
At the moment, this doesn't actually create a problem, because no
one seems to be using the $sessionID which is returned by checkauth(),
except in the case of opac/external/overdrive/auth.pl which skips
the second declartion as it doesn't require auth.

This patch removes the redefining of the $sessionID variable.

In terms of testing, try logging in with a username and password
and see if it works. The only risk this patch would pose is breaking
auth I would think, since nothing is actually using the return value
from checkauth() for $sessionID.

NOTE:
It was initially defined near the top of the function (~line 791).
I believe the scoping would mean the correct version of $sessionID
would be used in the latter lines for the unset'ing.
I have skimmed code to see if the sessionID return value is used.
I did not test overdrive, as I do not know how. However, this is
the only area, I think this could possibly break. This change makes
sense to me.

QA: Please test overdrive.
opac/external/overdrive/auth.pl only checks if the value is set, so
   this patch might fix/break something there?
opac/svc/overdrive same kind of check.

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
This is a (tiny) code improvement. Now we consistently return the session
id that is also stored in the returned cookie. (Which can be an 'anon'
session.)
Fact is that Koha almost everywhere ignores the returned session id and
sometimes gets the session from the cookie (obviously). The session id is
also passed to the template by get_template_and_user but never used in
templates.
As mentioned, the two overdrive scripts are the exception. But since both
test on both $user && $sessionID, they will not choke on an anynonomous
session id without userid. So theoretically fine, but not tested.

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 331af8521b)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-17 14:26:56 +01:00
Tomas Cohen Arazi 637469974c
Bug 21285: Add missing select2x2.png file
This file is part of the Select2 jquery plugin, but wasn't added when
the use of the plugin was introduced in Koha.

To test:
- On a high DPI screen (retina mac?) on Chrome or Safari
- Edit an item
=> FAIL: dropdowns using Select2 (like 'Shelving location') don't display the icons (down arrow and cross) and a default value is wrongly selected
=> FAIL: the inspector says the requested select2x2.png file returned a 400 error.
- Apply this patch
- Reload the edit page
=> SUCCESS: Things display correctly! Dropdowns without selected values
by default!
=> SUCCESS: No errors fetching select2x2.png
- Sign off :-D

Signed-off-by: Jesse Maseto <jesse@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 235654a3cf)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-17 14:08:26 +01:00
Nick Clemens 3017d592a1
Bug 21235: DBRev 18.05.04.001
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit c66a2894e1)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-11 10:18:03 +01:00
Martin Renvoize f7e65044f9
Bug 21235: (QA follow-up) Remove table services_throttle
Add the missing db update to nuke the services throttle from high orbit

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 96a095f4e1)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-11 09:41:36 +01:00
Jonathan Druart 028c23fecf
Bug 21235: Remove table services_throttle
This table was only used by XISBN, this patch remove the table and the
related code (cronjobs)

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

https://bugs.koha-community.org/show_bug.cgi?id=21235
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 6a2a80988d)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-11 09:41:10 +01:00
Tomas Cohen Arazi 1c58af16be
Bug 20776: Add Selenium::Remote::Driver to the dependency list
This dependency is missing from the PerlDependencies.pm file.
This patch adds it.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 418c65d2e2)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-11 09:30:26 +01:00
Tomas Cohen Arazi ee1eec9d25
Bug 21267: Set X-FORWARDED-PROTO https if required
This patch makes the apache configuration for the reverse proxy
(required for Plack) so it sets the X-FORWARDED-PROTO header correctly
for Plack::Middleware::ReverseProxy to use it.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Ulrich Kleiber <ulrich.kleiber@bsz-bw.de>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Since we actually resolve 19799 now (Changing language on OPAC redirects
back to homepage), I will move that code to a new enh report.

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 302dd7bf82)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-05 15:43:43 +01:00
Martin Renvoize 3516f113b7
Bug 21202: Replace C4::Items::GetItemsByBiblioitemnumber calls
http://lists.koha-community.org/pipermail/koha-devel/2018-August/044757.html

Prior to this patch, GetRecords returned timestampX, cardX and borrowerX
for
the last 3 patrons who checked out the items.

I have no idea if it is a desired effects but, as this code has been
there for a very long time (2005), I suspect it's not.
The "doc" (/ilsdi.pl?service=Describe&verb=GetRecords) does not say
anything about the checkouts info.

Test plan:
hit /ilsdi.pl?service=GetRecords&id=1
and confirm the info about items are displayed correctly
Signed-off-by: Josef Moravec's avatarJosef Moravec
<josef.moravec@gmail.com>
Signed-off-by: 's avatarMarcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Wm. Nick Clemens's avatarNick Clemens
<nick@bywatersolutions.com>

RMaint: Converted to deprecation warning
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-05 13:52:41 +01:00
Jonathan Druart e9f859c0e4
Bug 21207: Remove unused RM C4::Overdues::GetItems sub
Test plan:
  git grep GetItems
  | grep -v GetItemsInCollection
  | grep -v GetItemsForInventory
  | grep -v GetItemsInfo
  | grep -v GetItemsLocationInfo
  | grep -v GetItemsAvailable
  | grep -v GetItemsByBiblioitemnumber

should not return any occurrences of code in perl scripts

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 3795141f54)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-09-05 11:40:54 +01:00