koha.git
6 months agoUpdate release notes for 18.05.13 release v18.05.13
Lucas Gass [Fri, 31 May 2019 14:42:54 +0000 (14:42 +0000)]
Update release notes for 18.05.13 release

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

6 months agoIncrement version for 18.05.13 release
Lucas Gass [Sun, 26 May 2019 18:21:55 +0000 (18:21 +0000)]
Increment version for 18.05.13 release

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

6 months agoTranslation updates for Koha 18.05.13
Koha translators [Fri, 31 May 2019 13:43:03 +0000 (10:43 -0300)]
Translation updates for Koha 18.05.13

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

6 months agoBug 22881: Trying to clear search history via the navbar X doesn't clear any searches
Owen Leonard [Fri, 10 May 2019 13:24:39 +0000 (13:24 +0000)]
Bug 22881: Trying to clear search history via the navbar X doesn't clear any searches

This patch undoes a mistake introduced in my patch for Bug 21479. A
"preventDefault()" was added to the search history clear button by
mistake. The "confirmDelete" function only works if the default action
of the link is allowed to complete.

To test you must have the EnableOpacSearchHistory system preference
enabled. Apply the patch and log into the OPAC as a patron who has a
search history.

Click the "X" link in the header next to the "Search history" link.
Confirm that you want to clear your search history. The page should
refresh. Navigate to your account -> Your search history to confirm that
your search history has been cleared.

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

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 6d1b7ff27eb2d53d637c169c7132a66d546c0124)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit b95682f73549cd9ddda73c61a54a4b45b0443cbe)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

6 months agoBug 21709: Replace 'no popup' plugin links with a span
Jonathan Druart [Thu, 1 Nov 2018 16:31:31 +0000 (13:31 -0300)]
Bug 21709: Replace 'no popup' plugin links with a span

Test plan:
Edit a bibliographic record
Notice that the icons next to fields linked with a plugin can be a link
or not. The browser displays a pointer or not.

It will remove the ambiguity to display an icon that is clickable but
does nothing when clicked.
We could also have another icon to disociate both behaviors.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 9fa97774ae6b3c84028b15f8c768460a012320ea)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 3c0718c7a78104c1ff2eb359c04341bf1ee10888)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

6 months agoBug 22816: OPAC detail holdings table should now look a bit better
Liz Rea [Wed, 1 May 2019 00:31:15 +0000 (00:31 +0000)]
Bug 22816: OPAC detail holdings table should now look a bit better

This patch sets the "autowidth" option to "false" for the OPAC
holdings DataTable on opac-detail.pl. This gives the table a fluid
width rather than having the width be "hard-coded" by DataTables upon
first page render.

To test, apply the patch and view the detail page for a bibliographic
record with some items. Under the "Holdings" tab, the table of
holdings should fill the width of the tab container.

Resize the browser window and confirm that the table width adjusts
accordingly.

Signed-off-by: Bin Wen <bin.wen@inlibro.com>
Signed-off-by: arthur <arthur.bousquet@inlibro.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 604c7b818b63b93c66bb751ceb9d99bc1c109be9)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 32761305d3064cea7da31447e045c4989fdf3c26)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

6 months agoBug 21036: Remove odd number of elements warnings from AuthoritiesMarc.pm
Marcel de Rooy [Thu, 5 Jul 2018 10:10:26 +0000 (12:10 +0200)]
Bug 21036: Remove odd number of elements warnings from AuthoritiesMarc.pm

Like this one (16.11 line number):
Odd number of elements in anonymous hash at C4/AuthoritiesMarc.pm line 1070.

We need to add a scalar to some MARC::Field::subfield calls. In list context
an empty list returned affects the hash built around it.

Test plan:
Could reproduce this warning easily from OPAC authority search.
opac-authorities-home.pl calling BuildSummary.

Signed-off-by: Bouzid Fergani <bouzid.fergani@inlibro.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 88b37330abaee6372ec999c1a81fd216d66a1379)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit b3af8f93637a7d54dac3426f54057f8034b24eee)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

6 months agoBug 21036: Fix warnings from C4/Biblio
Marcel de Rooy [Thu, 5 Jul 2018 07:53:57 +0000 (09:53 +0200)]
Bug 21036: Fix warnings from C4/Biblio

Use of uninitialized value $isbn in string ne at /usr/share/koha/prodclone/C4/Biblio.pm line 1794. (16.11 line number)
Trivial edit.

And these warnings from TransformHtmlToXml (with 16.11 line numbers):
Use of uninitialized value in substr at /usr/share/koha/prodclone/C4/Biblio.pm line 2527.
Use of uninitialized value in substr at /usr/share/koha/prodclone/C4/Biblio.pm line 2528.
substr outside of string at /usr/share/koha/prodclone/C4/Biblio.pm line 2528.
Indicator in 952 is empty at /usr/share/koha/prodclone/C4/Biblio.pm line 2534.

The last warning is not needed and can be removed.
Note that the code used the construct @$indicator[$j] for $$indicator[$j].
The first is an array slice. This worked in list context. But apparently
the second was meant to be used. And can be rewritten as $indicator->[$j]
which generally is considered more readable.
The code around indicator1/2 and ind1/2 is simplified. This change is applied
twice in the same sub.

Test plan:
Read the changes.
Run t/Biblio/TransformHtmlToXml.t

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 295e9b1054386cf188c5fc1eb4fd590e5c451513)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 6413f40738185f5319c66b763cb5bedc6fba8745)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

6 months agoBug 21036: Fix uninitialized value within @itemnumber in string ne
Marcel de Rooy [Wed, 4 Jul 2018 14:49:38 +0000 (16:49 +0200)]
Bug 21036: Fix uninitialized value within @itemnumber in string ne

Line from 16.11 log:
Use of uninitialized value within @itemnumber in string ne at /usr/share/koha/prodclone/reserve/modrequest.pl line 70.

Test plan:
Read the change. Not 100% identical (numeric zero) but should be enough.
This line is probably not needed at all.

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 4560d9623663e9fd0b60f9a39ec53082cdd90f24)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit ffae11293afb3f80e434e7c84b75e240f7512350)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

6 months agoBug 22527: (RM follow-up) Add filter
Nick Clemens [Tue, 7 May 2019 15:57:35 +0000 (15:57 +0000)]
Bug 22527: (RM follow-up) Add filter

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit d38d78bcf4cc62d34aa953864cf6da87bef93c80)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 5f46508f811ae7be0b777bacda4576119259aee2)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

6 months agoBug 22527: web installer links to outdated DB manual
Liz Rea [Tue, 16 Apr 2019 06:55:36 +0000 (06:55 +0000)]
Bug 22527: web installer links to outdated DB manual

To reproduce:
1. Use MySQL or MariaDB for your Koha installation
2. Create an empty database and point $KOHA_CONF to this database name.
3. Grant SELECT privilege to your database user, e.g.
grant select on koha3.* to 'koha'@'%' identified by 'koha';
4. Go to step 2 of web installer where it checks database
connection
5. Observe the following message

     User koha doesn't have enough privilege on database koha.

     Ask for or make a change in the user's privileges. User koha must
     have USAGE, INSERT, UPDATE, DELETE, DROP and CREATE privileges on
     database koha2.

     Need help? See manual for PostgreSQL

6. Note "See manual for PostgreSQL" is wrong. Should now read Need help?
For help with granting permissions, please search online for "[%
dbms %] manual grant permissions" of course the dbms should be the dbms
you are using.
7. Apply patch, restart all
8. Refresh page and observe it now displays correct link

Test plan and original patchset by Lari Taskula <lari.taskula@hypernova.fi>

Sponsored-by: Hypernova Oy

Signed-off-by: Hayley Mapley <hayleymapley@catalyst.net.nz>

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

Bug 22527: Remove extra space after '?'

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit abd4445cd2b86fe601de20b403bb621115b27c83)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit e98714dc8777d890e51fa015dff701f4b1b8169e)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

6 months agoBug 22787: Add mapping of letters "ů" and "Ů" to zebra definitions
Josef Moravec [Mon, 29 Apr 2019 12:18:43 +0000 (14:18 +0200)]
Bug 22787: Add mapping of letters "ů" and "Ů" to zebra definitions

Test plan:
0) Do not apply the patch
1) Add some word with character "ů" into metadata, for example author "Martinů, Bohuslav"
2) Try to search it with "Martinu" and you'll see you can't find it
3) Apply the patch
4) Copy file etc/zebradb/etc/word-phrase-utf.chr to your /etc/koha directory
    sudo cp etc/zebradb/etc/word-phrase-utf.chr /etc/koha/zebradb/etc/
5) koha-zebra --restart kohadev
6) koha-rebuild-zebra -f kohadev
6) try to search "Martinu" again - you should be able to find your record

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Michal Denar <black23@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit d57239ca78e7719f4c04865e8c493919c6362c15)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 006fa1a49789763892b9fcd286b7e3d875472e10)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

6 months agoBug 21671: Prevent Modifications.t to fail randomly
Jonathan Druart [Mon, 12 Nov 2018 18:20:33 +0000 (15:20 -0300)]
Bug 21671: Prevent Modifications.t to fail randomly

If repeatable is set to 0 by TestBuilder, the tests will fail with:
t/db_dependent/Koha/Patron/Modifications.t .. 1/6     # Looks like you planned 20 tests but ran 9.

 #   Failed test 'approve tests'
 #   at t/db_dependent/Koha/Patron/Modifications.t line 259.
[repeatable not set for attribute type and tried to add a new attribute for the same code]# Looks like your test exited with 255 just after 5.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 914f23970de536df3972ebd75b280ee8eec98955)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 3f99fb0c4c8b85285cd7b22d77d8d15cadda5098)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

6 months agoBug 22813: (follow-up) Add missing condition
Tomas Cohen Arazi [Tue, 30 Apr 2019 18:48:14 +0000 (15:48 -0300)]
Bug 22813: (follow-up) Add missing condition

This patch restores a missing condition. $patron gets renamed to make
it obvious that it related to the logged in user.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 45b1ff8dfa1054590544caff200b307144bd02cf)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

6 months agoBug 22813: remove repetitive queries inside two nested loops in searchResults
Tomas Cohen Arazi [Tue, 30 Apr 2019 15:30:25 +0000 (12:30 -0300)]
Bug 22813: remove repetitive queries inside two nested loops in searchResults

This patch moves a query on Koha::Patrons and then the related
Koha::Patron::Category that needlessly happens inside two nested loops
(all items of all MARC records in the resultset).

The Koha::Patron and Koha::Patron::Category are always the same as it is
fetched from C4::Context->userenv each time.

To test:
- Run:
  $ kshell
 k$ prove t/db_dependent/Search.t
=> SUCCESS: Tests pass
- Apply this patch
- Run:
 k$ prove t/db_dependent/Search.t
=> SUCCESS: Tests still pass!
- Sign off :-D

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

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 10efe4e3f239c47b847c53f06f82245e07d54759)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 738aafb92dcfb73f51f9302fa9506040a8cc2930)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

6 months agoBug 22808: Move Cache.t to db_dependent
Mirko Tietgen [Tue, 30 Apr 2019 08:56:20 +0000 (10:56 +0200)]
Bug 22808: Move Cache.t to db_dependent

Cache.t fails during package build. Moving it to db_dependent fixes
the problem.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 6509d73d7925fe5d317d6f2baa1d1565d8d36220)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 3653df7715744f583bd33c62775d2ec8f7753b0a)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

6 months agoBug 22621: Fix filters on subscription search results
Jonathan Druart [Wed, 24 Apr 2019 02:49:46 +0000 (22:49 -0400)]
Bug 22621: Fix filters on subscription search results

Caused by
  commit 4e698f7b478a094d7b32ebfeaa917bca05ebcc5b
  Bug 18426: Allow to edit subscriptions in batch

There is a shift caused by a hidden column, which make the filters
searching on the previous column.

Test plan:
- Add 1+ searchable additional field for subscription
- Create a new subscription
- Search for subscriptions
- Use the column filters to filter the results
=> The results must be filtered accordingly

Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de>

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 1d6e9ff44c19379a41e9ce688685a24788583e0c)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit b61c41f0efebac66d561070d5a3e4533354d90d0)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

6 months agoBug 21589: Series link formed from 830 field is incorrect
Kyle M Hall [Wed, 17 Oct 2018 18:43:11 +0000 (14:43 -0400)]
Bug 21589: Series link formed from 830 field is incorrect

Bug 13692 corrected the series link for records using a 490/800 combination

When a record has a 490/830 conbination for series, the link is malformed (title is used as author, title is blank)

Test Plan:
1) Catalog two or more records with 830 fields
2) Note the series links are broken
3) Apply this patch
4) Reload the record details page
5) The series link should now work
6) Repeat for the OPAC

Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de>

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 20496bc78b7830d812fda454a0fe243fae9c465c)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 07fc6e0c53512882534af0364c3bb741be20c179)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

6 months agoBug 22715: Remove extraneous html filter
Nick Clemens [Thu, 25 Apr 2019 17:47:14 +0000 (17:47 +0000)]
Bug 22715: Remove extraneous html filter

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 7e85754083bd66f45009f55a01e9dec9eda81504)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 310330590a14757ac3b35a2956ba56512ee65534)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

6 months agoBug 22715: Searching for patrons with "" in the circulation note hangs patron search
Kyle M Hall [Tue, 16 Apr 2019 14:34:56 +0000 (10:34 -0400)]
Bug 22715: Searching for patrons with "" in the circulation note hangs patron search

To replicate:
Edit a patron to have a circ note, include quoted text in it, such as "this is quoted string"
Go to the patron search, search for a set of results that would include the patron with the quotes in the note
Enjoy looking at "Processing" for forever.

Test Plan:
1) Apply this patch
2) Attempt to replicate using the steps above

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
I took this a step further and used <script>"something in
quotes"</script> for my test note and this worked just fine. YAY.

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 6e641c5bcb7370556326fb64838fce1eefbc2c18)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 57a7cea7200f69966089b06c54e1482d4daae5ef)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

6 months agoBug 20692: Extreme toggle checking for plack
Mark Tompsett [Mon, 28 May 2018 16:45:29 +0000 (16:45 +0000)]
Bug 20692: Extreme toggle checking for plack

TEST PLAN
---------
sudo koha-plack --disable
sudo koha-plack --disable
sudo koha-plack --enable

sudo koha-plack --disable
echo $?
sudo koha-plack --disable
echo $?
sudo koha-list --noplack
echo $?
sudo koha-plack --enable
echo $?
sudo koha-plack --enable
echo $?
sudo koha-list --plack
echo $?

git bz apply 20692
sudo perl ~/misc4dev/cp_debian_files.pl
then repeat the test.

It should also be noted, because the enable
and disable are now split, if for some reason
they become out of sync, an enable or disable
should correct them.

Because these are bash scripts, the test tool
(/home/vagrant/qa-test-tools/koha-qa.pl)
does not apply.

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit de20398db303a1ee45b62f9aa51f124597ed0cd8)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 84adcb4017e7be038e5e32c37a6b40e4ab9f59c7)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

6 months agoBug 20891: Escape html then JSON
Jonathan Druart [Fri, 8 Jun 2018 15:19:41 +0000 (12:19 -0300)]
Bug 20891: Escape html then JSON

To my understanding we need to escape first html chars then to JSON.

If this patch works we will need to rethink the 'To' TT plugin.
It was originally designed to have several escape methods, but with
these changes it will not make sense to name it 'To' if used only to
escape JSON

IIRC we should keep the 2 different ways to use it:
 * [% To.json( string ) %]
 * [% string | $To %]
otherwise it will be hard to use it when called in argument of
patron-title.inc (`git grep To.json`)

Signed-off-by: Liz Rea <wizzyrea@gmail.com>

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit bdf0d85c1de9cbb37cc8a40b0b4a2e86633d3aaf)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 6bf436065ebf93cbda4e67c05a238b0e63c22d42)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

6 months agoBug 20891: Escape list's names in JSON
Jonathan Druart [Thu, 7 Jun 2018 15:17:26 +0000 (12:17 -0300)]
Bug 20891: Escape list's names in JSON

When someone uses \ in the description of a list, the datatable in staff
won't load and keeps processing.

Test plan:
- Create a list named "<script>alert('hola');</script>"
- Create another list named "k\o\h\a"
- Hit /cgi-bin/koha/virtualshelves/shelves.pl

=> Without this patch the lists will not be displayed, JSON is
malformated
=> With this patch everything is ok

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

Signed-off-by: Liz Rea <wizzyrea@gmail.com>

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 2be0195895628ec491ee1f25368e60181c4f1eb2)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 05ffb6c6af451aa764f0cb4be1d712d7334f1167)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

6 months agoBug 22743: Add password modal to overdrive results page
Nick Clemens [Fri, 19 Apr 2019 11:25:43 +0000 (11:25 +0000)]
Bug 22743: Add password modal to overdrive results page

This patch also removes a line abotu ratings which was throwing an error.
Confirm stars rating for OD results are still shown as expected

To test:
 1 - Enable overdrive circulation with password required
 2 - Sign in to OPAC but not overdrive
 3 - Perform a search that returns overdrive results
 4 - Click in to results page
     http://localhost:8080/cgi-bin/koha/opac-overdrive-search.pl?q=cats
 5 - Note 'Login to OverDrive account' link
 6 - Click it
 7 - Nothing happens!
 8 - Apply patch
 9 - Repeat
10 - Success!

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 7be176cf1da5adb5f264bb9668667dfeb1d9a2ae)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 461c7176735cbfd4ed7db97a9fa094b60ac2e0ca)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

6 months agoBug 22739: Test SelfCheckInTimeout <> 0, not just defined
Tomas Cohen Arazi [Fri, 19 Apr 2019 12:28:35 +0000 (09:28 -0300)]
Bug 22739: Test SelfCheckInTimeout <> 0, not just defined

On sci-main.pl the preference value is tested for 'defined'. This patch
tests it is different than empty string too. This was causing a
JavaScript syntax error, that made it display a wrong message.

To test:
1 - Blank the syspref SelfCheckInTimeout
2 - Attempt to checkin something via sci
=> FAIL: The 'Your request included no check-ins.' message is printed.
3 - Apply this patch, reload the sci-main.pl page
4 - Attempt to checkin something via sci
=> SUCCESS: The UI correctly stacks the scanned barcodes
5 - Sign off :-D

Signed-off-by: Liz Rea <wizzyrea@gmail.com>

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit c1949cda9b2847bc6ecf7e1dbc07990c4055b69a)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 1269f7d6c7712b3c9115824660d5f12933ba6462)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

6 months agoBug 22723: Correct syntax error on confess call in Koha/MetadataRecord/Authority.pm
Fridolin Somers [Wed, 17 Apr 2019 11:58:57 +0000 (13:58 +0200)]
Bug 22723: Correct syntax error on confess call in Koha/MetadataRecord/Authority.pm

In Koha/MetadataRecord/Authority.pm the call to confess is missing string quotes.

It may generates this error :

Can't locate object method "confess" via package "Empty String at /usr/share/perl5/MARC/File/XML.pm line 448.
" (perhaps you forgot to load "Empty String at /usr/share/perl5/MARC/File/XML.pm line 448.
"?) at /home/koha/src/Koha/MetadataRecord/Authority.pm line 186.

Simply missing double quotes.
Also missing use Carp to call confess.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 4e2c74fced685db861a78fc1aa151dd35ad0d5f2)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 4863e59c5798fda6883c354eeb5096d4609e42bd)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

6 months agoBug 22762: Fix items.collection display on receiving
Jonathan Druart [Wed, 24 Apr 2019 04:09:44 +0000 (00:09 -0400)]
Bug 22762: Fix items.collection display on receiving

Caused by
  commit 31c29fd31f557306233e6a2936148a5bb10b89a1
  Bug 21206: Replace C4::Items::GetItem

The log says: The method Koha::Item->collection is not covered by tests!

It has highlighted an older problem:
Since
  commit bb1e9c500c810402c64436c53bcc00ffb9a0b857
  Bug 17248 - Koha::AuthorisedValues - Remove GetKohaAuthorisedValueLib
the "Collection code" is not filled correctly (items.collection vs items.ccode).

Test plan:
- Set acqcreateitem to "when placing an order"
- Receive an order with items
=> The "Collection code" column must be filled with the items.ccode value
- Edit an item
- Change the collection code value
=> The "Collection code" column must be filled with the new value

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 49c99ced88af8d9d17d433c69322b862d30aee8a)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 22735: Resolve internal server error on missing item type
Marcel de Rooy [Fri, 19 Apr 2019 06:49:48 +0000 (06:49 +0000)]
Bug 22735: Resolve internal server error on missing item type

Trivial fix, similar to opac-detail, applied to ISBD and MARC detail.

Test plan:
Enable ArticleRequests pref.
Make sure you have a biblio with no item type in 942c. (Perhaps you need to
make 942c not mandatory temporarily and save a biblio record without this
field being filled.)
If you are logged in, log out.
Go to MARC or ISBD detail page. No crash anymore?

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

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit b78bd2faec703bb7d7c750dbc1070ba2449f29a9)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit b99fbdd8fc85beb989a51142bb531673748bc344)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 21937: Syspref autoBarcode annual doesn't increment properly barcode
Frédéric Demians [Mon, 3 Dec 2018 17:02:03 +0000 (18:02 +0100)]
Bug 21937: Syspref autoBarcode annual doesn't increment properly barcode

This patch fix the barcode annual builder. The test should pass.

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 31ace6a9347a8260532f6cc50d55fc36f87f1b44)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 9109d862a08a53dd6328eed902dd4ed45de7f673)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 21937: Add test to show autoBarcode annual increment bug
Frédéric Demians [Mon, 3 Dec 2018 17:27:08 +0000 (18:27 +0100)]
Bug 21937: Add test to show autoBarcode annual increment bug

This patch show the issue. If the DB contains a barcode (not auto attributed
by Koha) which begin with the year used to generate automatically a new one,
there may be a 'collision'.

prove -v t/db_dependent/Barcodes_ValueBuilder.t

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 7262bc066784247b12ce7f25c390498086e1d72b)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit a85edfb2be449cf65691d1e4b32080310ac7aad2)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 22365: Removing warn when accessing Log Viewer
Aleisha Amohia [Tue, 19 Feb 2019 01:36:14 +0000 (01:36 +0000)]
Bug 22365: Removing warn when accessing Log Viewer

To test:
Go to Tools -> Log Viewer and confirm the warn no longer shows after
applying the patch.

Sponsored-by: Catalyst IT

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

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 8adb2f8003e25f6fe8cc78506a823a618a837fa1)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 8bd263601499ae1aa13587b37c62dfa27b4c7def)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 22716: Use gender-neutral pronouns in system preference descriptions
Owen Leonard [Tue, 16 Apr 2019 16:34:13 +0000 (16:34 +0000)]
Bug 22716: Use gender-neutral pronouns in system preference descriptions

This patch makes a few corrections to the .pref files which provide
descriptions for system preferences. Language like "him or her" is
replaced with "they/them" pronouns.

To test, apply the patch and check the following preferences:

 - OPACFineNoRenewalsBlockAutoRenew
 - ExpireReservesMaxPickUpDelayCharge
 - PatronSelfRegistrationVerifyByEmail

Signed-off-by: Lisette <lisettes@latahlibrary.org>

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 4b3eb99ad6cd9fc8e9bac6627c38bd16600aa38a)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 4c44dfd8fe2ee4e64acb283ef25f6cd21c969927)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 21172: Remove obsolete framework parameter from GetMarcFromKohaField
Katrin Fischer [Sun, 14 Apr 2019 03:13:01 +0000 (03:13 +0000)]
Bug 21172: Remove obsolete framework parameter from GetMarcFromKohaField

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 2a9b9a526bb3e1c73e09cbee499a2debcab74ee5)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit b1d1d5ab915b8b664e0ac321876a414655762ee4)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 21172: Remove warning from addbiblio.pl
Jonathan Druart [Tue, 7 Aug 2018 20:06:41 +0000 (17:06 -0300)]
Bug 21172: Remove warning from addbiblio.pl

Argument "01e" isn't numeric in numeric ne (!=) at
/home/vagrant/kohaclone/cataloguing/addbiblio.pl line 507.

A tagfield can be 01e and so raise a warning is compared with == or !=

This patch also fixes few inconsistencies:
- tagfield for items.itemnumber must be retrieved with GetMarcFromKohaField
(to support other marcflavours)
- do not use $_
- loop only once on $usedTagsLib

Test plan:
For devs only, read the code and confirm the changes make sense.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit f3afec0587f4baeff580e153ea592020d4d36be3)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 1ed01089db28deb6f9689bbb64c30ee805559dbf)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 22154: Fix search for Braille from Advanced search page
Katrin Fischer [Thu, 4 Apr 2019 01:36:47 +0000 (01:36 +0000)]
Bug 22154: Fix search for Braille from Advanced search page

When you do an advanced search and choose the Format subtype
Braille, it looks for l-format:fk, but that is not the right
code for Braille.

fk does not exist. It should be fb for Tactile material/Braille
OR tc for Text/Braille

To test:
0) Catalog 2 records, one with 007 tc and another with fb
   Use value builder to verify both are for Braille.
1) In Administration > System preferences, make sure 'Subtypes'
   is checked in either OpacAdvSearchMoreOptions or OpacAdvSearchOptions
2) Go to Advanced search
3) If necessary, click on 'More options'
4) In the 'Subtype limits' section, choose 'Braille' from the 'Format'
   drop-down menu
5) Click on 'Search'
6) Verify both records were found

Signed-off-by: Michal Denar <black23@gmail.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 44a39929afc60ddda3182a93197ced098044a12d)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit f53fe14580549266b098a303c4be389fee505b60)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 18011: Enrollment period date on patron category can be set in the past without...
Owen Leonard [Fri, 12 Apr 2019 11:04:06 +0000 (11:04 +0000)]
Bug 18011: Enrollment period date on patron category can be set in the past without any error/warning messages

This patch modifies the patron category edit form so that the enrollment
period datepicker widget cannot be used to select a date in the past.

The <input> element had a "datepicker" class, which triggers a default
datepicker configuration. This was overriding the configuration in the
page-specific JavaScript file.

To test, apply the patch and go to Administration -> Patron categories.

Click the "Enrollment period -> Until date" field and verify that dates
before today are disabled.

Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault@inLibro.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 34c835ed141a3b4758ad77e5b72f30e83d57024f)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 89f0c3a9da9d009e7fea0c76f706676078dc9860)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 22090: Add missing information to cash register CSV file
Katrin Fischer [Sun, 7 Apr 2019 18:23:32 +0000 (18:23 +0000)]
Bug 22090: Add missing information to cash register CSV file

Some information was missing from the CSV export file
of the Cash register report: manager surname, patron surname
and payment notes.

Also pretties up the column headers a bit and makes the
sequence between GUI and CSV export match.

To test:
- Make sure you have some fines and fees and payments in
  your system
- Make a search with the Cash register report
- Export results as CSV
- Proof read hader line and make sure contents match headings
- Verify first name and surname are shown for manager and patron
- Verify notes show up

Signed-off-by: Michal Denar <black23@gmail.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 1a2572915b4bf4a11b3a65c3a65e506610263a03)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 5469ae4eea46416410bddaef4934aa1db6e767f9)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 22692: (RMaint Follow-up) fix tests
Lucas Gass [Thu, 2 May 2019 01:39:50 +0000 (01:39 +0000)]
Bug 22692: (RMaint Follow-up) fix tests

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 22478: (follow-up) [18.05.X ONLY] Fix rebase and fix selenium opac_auth
root [Tue, 7 May 2019 18:01:45 +0000 (18:01 +0000)]
Bug 22478: (follow-up) [18.05.X ONLY] Fix rebase and fix selenium opac_auth

We missed a case or two in the backport, also picked changes from
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=76414&action=diff
in order to fix opac auth in selenium

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 22478: (RMaint follow-up) Fix blank line before =head1
Lucas Gass [Tue, 30 Apr 2019 23:29:15 +0000 (23:29 +0000)]
Bug 22478: (RMaint follow-up) Fix blank line before =head1

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoUpdate release notes with security bugs
Martin Renvoize [Thu, 2 May 2019 12:49:07 +0000 (13:49 +0100)]
Update release notes with security bugs

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

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoUpdate release notes for 18.05.12 release
Lucas Gass [Mon, 29 Apr 2019 05:15:04 +0000 (05:15 +0000)]
Update release notes for 18.05.12 release

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 22692: Check for patron using cardnumber and userid
Nick Clemens [Fri, 12 Apr 2019 01:23:34 +0000 (01:23 +0000)]
Bug 22692: Check for patron using cardnumber and userid

TO test:
1 - Set failed login attempts to 1
2 - Attempt a login with a userid and bad password, no success
3 - Attempt a login with userid and correct password, prevented because
locked
4 - Attempt a login with cardnumber and right password, you are logged
in
5 - Log out, try again with userid and correct password, prevented
because locked?
6 - Apply patch
7 - Repeat 1-3 to lock account
8 - Attempt logging in with cardnumber, you are prevented

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit ebc15764ff3371a9327cfe60c22c1186e5a200ae)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 22692: Unit tests
Nick Clemens [Fri, 12 Apr 2019 01:11:19 +0000 (01:11 +0000)]
Bug 22692: Unit tests

1 - Apply just this patch
2 - prove -v t/db_dependent/Auth.t
3 - Failure
4 - Apply second patch
5 - prove -v t/db_dependent/Auth.t
6 - Success

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit bc066fea9f855c0fc4e1fbc43736121783d3b77b)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 22478: (RMaint follow-up) source t::lib::Mocks
Martin Renvoize [Fri, 26 Apr 2019 16:24:06 +0000 (17:24 +0100)]
Bug 22478: (RMaint follow-up) source t::lib::Mocks

In 18.11.x the t::lib::Mocks module is not yet sourced for the relevant
test

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 0f69e4ae485b6c7f94231ea34ad057b1d4cefff7)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 22478: (QA follow-up) Update tests to check for any script tags
Martin Renvoize [Mon, 29 Apr 2019 12:30:09 +0000 (13:30 +0100)]
Bug 22478: (QA follow-up) Update tests to check for any script tags

(cherry picked from commit 01dc3a2a8b079b80a5aeb09b6a4c14ca667226a2)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 22478: (QA follow-up) Make test consistent with variable name
Martin Renvoize [Fri, 26 Apr 2019 18:56:43 +0000 (19:56 +0100)]
Bug 22478: (QA follow-up) Make test consistent with variable name

We were adding data to category 1 (private lists) and testing against
that, but we named the variable 'publist_lists'.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 5977db6738a50f398e9049db39d8a8e622546f2e)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 22478: (QA follow-up) Handle category in opac-shelves like a boolean
Marcel de Rooy [Fri, 12 Apr 2019 07:02:06 +0000 (07:02 +0000)]
Bug 22478: (QA follow-up) Handle category in opac-shelves like a boolean

The category parameter should be restricted to 1 or 2 (private/public). In
order to keep same behavior, no parameter means 1 (private).
Note: Adding the same line in intranet counterpart.

Test plan
[1] Check for category empty, '1a', '11' etc. And with script ;)

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 3d06afa4cdd9131fb9784a9d76b14a669e35ffc7)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 22478: Fix POD
Katrin Fischer [Wed, 10 Apr 2019 02:06:37 +0000 (02:06 +0000)]
Bug 22478: Fix POD

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

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit ab5a04e885b6a759e62d5fd78608302e89a14166)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 22478: Add tests
Jonathan Druart [Fri, 15 Mar 2019 16:41:27 +0000 (13:41 -0300)]
Bug 22478: Add tests

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

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit b398ba9f3e1a042ec0784100a32a48ba9c0fe2de)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 22478: Prevent XSS vulnerabilities when pagination appears
Jonathan Druart [Thu, 14 Mar 2019 22:42:50 +0000 (19:42 -0300)]
Bug 22478: Prevent XSS vulnerabilities when pagination appears

This is a bad one as we thought we were XSS safe since bug 13618.

The html code generated in C4::Output::pagination_bar must escape the
variables and values correctly.

This patch needs to be widely tested, everywhere the pagination appears,
to make sure we will not introduce regressions.

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

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit d4d1107afa873614ace241557e424de0dcbad20a)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 22542: Force back button to display personal data
Jonathan Druart [Thu, 21 Mar 2019 17:45:37 +0000 (14:45 -0300)]
Bug 22542: Force back button to display personal data

This is a follow-up of bug 5371

The following command must not return anything:
grep ^output_html_with_http_headers `git grep -l -P "authnotrequired\s*=>\s*0" opac`|grep -v force_no_caching

This must be a test somehwere to prevent further regressions.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 20d3d6788ec814e721d97f348be3749fffe662b6)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoIncrement version for 18.05.12 release
Lucas Gass [Mon, 29 Apr 2019 00:42:01 +0000 (00:42 +0000)]
Increment version for 18.05.12 release

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoTranslation updates for Koha 18.05.12
Koha translators [Mon, 29 Apr 2019 14:26:22 +0000 (11:26 -0300)]
Translation updates for Koha 18.05.12

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 22652: Editing Course reserves is broken
Lyon3 Team [Thu, 11 Apr 2019 08:48:42 +0000 (10:48 +0200)]
Bug 22652: Editing Course reserves is broken

To test:
1. Create a course reserve or go on an existing one
2. Add items and add a change for the holdingbranch
3. On the list of items in this course reserve
(course_reserves/course-details.pl?course_id=xx), click on "edit" at the
end of a row :

Without the patch, you can't see the holdingbranch you have choose for
this item, but you see "LEAVE UNCHANGED"

With the patch, you can see the holdingbranch you have choose when
adding this item in the course

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Mikaël Olangcay Brisebois <mikael.olangcay-brisebois@inLibro.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit ba14e9ca7d40af664f7079c6a9f85a85e88fca9a)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 27209dea6666c490431aa56485771d8e36c0125a)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 21346: Remove inline onclicks per comment 42
Christopher Brannon [Wed, 5 Dec 2018 20:33:25 +0000 (20:33 +0000)]
Bug 21346: Remove inline onclicks per comment 42

To test:
1)  Apply patch.
2)  Check that there is no changed behavior with buttons or checkboxes.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit d5d4501290704b9b3a0893a4a3df0a356abe445b)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit a1f80ad2950ea100e34260be7ae7d6e7f6f3bea7)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 21346: Convert dialogs to modals.
Christopher Brannon [Sun, 4 Nov 2018 03:47:30 +0000 (03:47 +0000)]
Bug 21346: Convert dialogs to modals.

This addresses most of the transfer dialogs.  There are some dialogs
that I have not converted because I don't know what triggers them,
therefore I cannot test them.

The following scenarios have been addresses, and should be tested:

FOR TRANSFERS

1) Checkin with no issue, hold or transfer; not at home (AutomaticItemReturn set to Don't)
     * Should give 3 options - Yes, Yes with print, or No.
     * Yes and Yes with print should trigger a transfer back home.
     * No should do nothing.
     * Print should open a window for printing, with correct
     information.
     * All three options should close the modal.

     TO TEST:
     1) Set AutomaticItemREturn to Don't.
     2) Check in an item with no issues, holds or transfers set, at a
     location other than the owning library.
     3) Test conditions above.

2) Checkin with no issue, hold or transfer; not at home (AutomaticItemReturn set to Do)
    * Should give 2 options - Print or OK.
    * Should automatically set transfer.
    * Print should open a window for printing, with correct information.
    * Both buttons should close modal.

    TO TEST:
    1) Set AutomaticItemReturn to Do.
    2) Check in an item with no issues, holds or transfers set, at a
    location other than the owning library.
    3) Test conditions above.

3) Checkin with no issues or holds, but transfer already set
    * Should give 3 options - OK, Print or Cancel.
    * OK and print should not touch existing transfer.
    * Cancel should remove the exisiting transfer.
    * Print should open a window for printing, with correct information.
    * All three options should close the modal.

    TO TEST:
    1) Check in an item following step 2 of either test above.
    2) Check in item again, while a transfer exists.
    3) Test conditions above.

WRONG BRANCH

4) If AllowReturnToBranch is not set "to any library", and the item is not checked in at the appropriate branch, the wrong-branch-modal pops up:
    * Should give 1 option - OK.
    * Should not check anything in or initiate a transfer.
    * OK should close the modal.

    TO TEST:
    1) Set AllowReturnToBranch to "only the library the item is from".
    You can test the other settings, as long as you pay attention to
    where you are checking the item in at.
    2) Check in an item at a branch other than the owning library.
    3) Test conditions above.

Signed-off-by: Lisette <lisetteslatah@gmail.com>

Signed-off-by: Liz Rea <wizzyrea@gmail.com>

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 5ed171a45c46f63b18266ad3a3d0a978719ca285)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit f3b362120f0b8a75a89ad6846e7bdad93b2e37ca)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 21346: Remove double dialog
Christopher Brannon [Thu, 1 Nov 2018 21:08:19 +0000 (21:08 +0000)]
Bug 21346: Remove double dialog

To Test:
1) Place a hold on an item for pickup at another branch.
2) Check in item to trigger hold and transfer.
3) Check in item again without changing location.  Note modal AND old
dialog behind modal.
4) Apply patch.
5) Check in item again without changing location.  Note modal without
the old dialog.

Signed-off-by: Lisette <lisetteslatah@gmail.com>

Signed-off-by: Liz Rea <wizzyrea@gmail.com>

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 230905e1d56a11cf5619f95c95920eb09803900c)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 6055a519c4474ab3b9004ed99b9b2e76c9735076)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 21346: Streamline logic in holds and transfers
Christopher Brannon [Thu, 1 Nov 2018 20:21:08 +0000 (20:21 +0000)]
Bug 21346: Streamline logic in holds and transfers

1) Replaced comparison with string to make testing branch easier.
2) Replaced useless 0 values with undef.

Does not change any behavior, only simplifies code.

Signed-off-by: Lisette <lisetteslatah@gmail.com>

Signed-off-by: Liz Rea <wizzyrea@gmail.com>

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 48787acc6f725686583bb05f45888acf3e1231d0)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit a1ff52bef45884b9a292cc5f84fdc49fce1c2c36)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 19670: (RMaint follow-up)
Lucas Gass [Tue, 23 Apr 2019 13:53:51 +0000 (13:53 +0000)]
Bug 19670: (RMaint follow-up)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 19670: DBRev 18.05.11.002
Lucas Gass [Tue, 23 Apr 2019 13:51:49 +0000 (13:51 +0000)]
Bug 19670: DBRev 18.05.11.002

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 19670: Change Collation of marc_field to allow mixed case mappings
Ere Maijala [Thu, 14 Mar 2019 12:33:18 +0000 (14:33 +0200)]
Bug 19670: Change Collation of marc_field to allow mixed case mappings

Test plan:
1. Apply patch and update database
2. Verify that you can add a search field mapping for both 100a and 100A.
3. Verify that the above also works with a newly-created database.

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

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit a5f3d405f56202beb4426da52f3bf4019f26484b)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 4a1986b6b102304ab0cce24e32a334f11d9556df)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 22607: DBRev 18.05.11.001
Lucas Gass [Tue, 23 Apr 2019 12:37:54 +0000 (12:37 +0000)]
Bug 22607: DBRev 18.05.11.001

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 22607: Change default value in issues.renewals to '0'.
Josef Moravec [Fri, 29 Mar 2019 08:13:48 +0000 (08:13 +0000)]
Bug 22607: Change default value in issues.renewals to '0'.

This patch change renewals column of issues and old_issues tables.

Now it is NOT NULL default 0. It does not make sense when number of
renewals is undefined, it is always integer with value zero or more

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit cf95f0a7e6897d3dc4b90c92ffad19230379d7cb)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit fd22ef99fe0d78bce28d659323bd8401067f198b)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 19497: Removed title (tooltip) from Edit button in items_search_fields.tt
Hayley Mapley [Thu, 14 Mar 2019 04:14:57 +0000 (04:14 +0000)]
Bug 19497: Removed title (tooltip) from Edit button in items_search_fields.tt

This patch removes the tooltip that appears when hovering over the Edit button
of Item Search Fields in the staff client. This was done for consistency reasons,
including that this tooltip is not translated and tooltips do not appear to be
on the majority of buttons in the staff client.

Test plan:
1) In Home->Administration->Item search fields create a new search field
if you haven't got any already
2) Observe the tooltip that appears when hovering over the Edit button in
the Item serach fields table.
3) Apply the patch and observe that the tool tip no longer appears.

Sponsored-by: Catalyst IT

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 968c888e1579ab28ec165819a011612d8b8f5570)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 634400f05c625a0724172c82004fc6209717bde1)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 22444: currencies_manage permission doesn't provide link to manage currencies...
Owen Leonard [Wed, 6 Mar 2019 19:02:50 +0000 (19:02 +0000)]
Bug 22444: currencies_manage permission doesn't provide link to manage currencies when selected alone

This patch modifies the acquisitions sidebar menu so that it checks
properly for the currencies_manage permission.

This patch also removes the menu link directly to the administration
home page. Since we're removing the check on the general
"CAN_user_parameters" permission it doesn't make sense to assume the
page is accessible.

To test, apply the patch and modifiy a staff user so that they have no
"parameters" permissions but do have "currencies_manage" permission.

Go to the Acquisitions home page. There should be a link to currencies
management in the sidebar menu.

Perform the same test with a user who has "parameters" permissions but
not "currencies_manage" permission. There should be no link to
currencies in the acquisitions sidebar menu. The user should have access
to the administrative home page.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 761b410f99cbbfff8e353c538fde2b6816408795)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit f7f13511d6a74359d65d7cc2348a73eb18da6044)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 21263: Pickup library not set correctly when using Default holds policy
Maryse Simard [Thu, 7 Feb 2019 13:24:03 +0000 (08:24 -0500)]
Bug 21263: Pickup library not set correctly when using Default holds policy

In the case of a specific item hold, it can only be fulfilled if the pickup library
matches the hold fulfillment policy. Therefore, if OPACAllowUserToChooseBranch is
set to don't allow, the pickup library should correspond to the policy.

In case of hold that does not specify an item, the homebranch or holdingbranch
can't be determined at this time, so the pickup library still defaults to the
homebranch of the borrower. Same if there is no policy or it states 'any'.

To test:
- Make sure OPACAllowUserToChooseBranch is set to don't allow
- Make sure you have two branches A and B
- Have one item whose homebranch is B
- Have one user whose homebranch is A
- Make sure the circulation rules allow the user to reserve the item's item type

1. Go to Administration > Circulation and fines rules
2. Create a Default holds policy by item type for that item type
    - Item type = item's item type
    - Hold policy = From any library
    - Hold pickup library match = item's home library
    - Return policy = item returns home
3. Go to the OPAC and log in with the user's credentials
4. Search for the item
5. Click on "Place hold"
6. Select a specific item and confirm hold
7. In the user's file on the OPAC and check the reservation's pickup library. It should be the item's homebranch

You can then repeat the steps for 'item's holding library' or 'any library' as
the Hold pickup library match. It should also work the same way if there is no
'Default holds policy by item type' for this item type but a 'Default checkout,
hold and return policy' set.

Finally, check that placing a hold without selecting a specific item still
defaults the pickup library to the borrower's homebranch.

Signed-off-by: Hayley Mapley <hayleymapley@catalyst.net.nz>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 275dee5f9b9a26b3490bf3646c71c78a2d8647eb)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 5236b45a055e90f21ae634acf5b07831ba8f02b8)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 21659: Change link to basket group edit page
Katrin Fischer [Thu, 4 Apr 2019 00:56:43 +0000 (00:56 +0000)]
Bug 21659: Change link to basket group edit page

I have taken another look at other links like the one
from acq order search and changed the link to not lead
to the vendor's basket group page but to the edit page
of the invidividual basket group.

To test:
- Same as first patch, verify links now lead
  to the basket grou edit page

https://bugs.koha-community.org/show_bug.cgi?id=21650

Signed-off-by: Jose-Mario Monteiro-Santos <jose-mario.monteiro-santos@inLibro.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 9cbc5f2aa072ec41a70fd1fa1de4f684fcd695e9)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit b1628abb3e3262f0eb712236f44991b7bb1799a9)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 21659: Fix links to basket groups from order receive page
Katrin Fischer [Mon, 11 Mar 2019 16:24:16 +0000 (16:24 +0000)]
Bug 21659: Fix links to basket groups from order receive page

Fixes a problem with the template variables on the order
receive page, so that the links to basket groups work
correctly again.

To test:
- Create some orders with and without basket groups
- Receive shipment
- Verify that the basket group links for pending orders work right
- Receive an order line
- Verify that the basket group links for received orders work right

Signed-off-by: Jose-Mario Monteiro-Santos <jose-mario.monteiro-santos@inLibro.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 3db5feb900d3e6a6400767c771afe78bab0fa880)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 6f1738121355fed39b7c9440e3ed47a05788987e)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 22624: Show OPAC description for authorised values in OPAC
Katrin Fischer [Mon, 1 Apr 2019 19:15:18 +0000 (19:15 +0000)]
Bug 22624: Show OPAC description for authorised values in OPAC

Patch adds the IS_OPAC parameter to a few GetByCode calls in
OPAC files.

To test:
- Add different OPAC and intranet descriptions to some authorised
  value categories:
  - TERM
  - DEPARTMENT
  - LOC
  - CCODE
- Create a new course using the values and adding items to it
- Check the course reserves overview and detail pages in OPAC
- Verify Department, term, location, and collection show
  the OPAC description if existing
- Create a subscription, make sure a default location is selected
- Check the OPAC detail page, subscription tab for this subsription
  in the OPAC
- Verify the location of the subscription displays correctly

Signed-off-by: Mikaël Olangcay Brisebois <mikael.olangcay-brisebois@inLibro.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 3323a428eaf662a0ba1a31b2cb56002a7372461a)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 764260ded4f350904c548422defb74d32581f65e)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 13629: SingleBranchMode removes both library and availability search from advance...
Owen Leonard [Thu, 4 Apr 2019 18:27:28 +0000 (18:27 +0000)]
Bug 13629: SingleBranchMode removes both library and availability search from advanced search

This patch modifies the OPAC advanced search form so that it is possible
to limit searches to available items even if there is only one library.

To test, apply the patch and go to the advanced search page in the OPAC.

 - With only one library configured: There should be a section labeled
   "Availability" with just the "only available" checkbox.

 - With multiple libraries: The section should be labeled "Location and
   availability" and should have the library dropdown and the
   availability checkbox.

Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault@inLibro.com>

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 7acb5394e1f62728c90a1d18e988c23a3e2862d2)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 781821b8aec54a5532c1a2da2e39df764f0bbb5e)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 14358: Changing the module refreshes the page and resets library choice
Owen Leonard [Thu, 4 Apr 2019 14:05:21 +0000 (14:05 +0000)]
Bug 14358: Changing the module refreshes the page and resets library choice

This patch makes an incremental change towards fixing Bug 14358: The
"New notice" button is converted to a dropdown button which asks the
user to select a module to start with.

To test, apply the patch and go to Tools -> Notices. Test the "New
notice" button and confirm that module selections are reflected in the
notice add form you are shown.

Signed-off-by: Mikaël Olangcay Brisebois <mikael.olangcay-brisebois@inLibro.com>

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit edf173e6ef1fa6de6e07f41c229799733456901a)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 99bc0ba719b2e23eb5b89f4ec8fc033461576109)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 20937: Truncate items for print notices when user has an email
Nick Clemens [Wed, 27 Feb 2019 17:45:47 +0000 (12:45 -0500)]
Bug 20937: Truncate items for print notices when user has an email

To test:
 1 - Set PrintNoticesMaxLines to 1
 2 - Checkout 2 (or more) items to a patron and make them overdue to trigger a
notice
 3 - Make sure the patron has an email
 4 - Make sure the notice you are sending is set to 'print' as the type
 5 - Run overdue_notices.pl without the 'nomail' option
 6 - Find the message and note all items have been added
 7 - Apply patch
 8 - Clear the message queue
 9 - Re-run overdue_notices.pl
10 - Confirm the message now has only 1 item.
11 - Set PrintNoticesMaxLines to 0
12 - Clear the message queue
13 - Re-run overdue_notices.pl
14 - Confirm the message has 2 items as expected

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

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

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 083f789b9548ec70d86dc48911df1bc9febda619)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 746b3930d5556d14d4fcc6a64612561edf8fef96)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 22075: Fix encoding problem with RIS export in OPAC
Katrin Fischer [Sun, 7 Apr 2019 16:25:28 +0000 (16:25 +0000)]
Bug 22075: Fix encoding problem with RIS export in OPAC

When exporting a record with diacritics in RIS
format from the detail page in OPAC the encoding
is not correct and the diacritics appear broken.

This patch fixes it.

To test:
- Find or create a record with some special
  chars in your OPAC
- Go to the detail page
- Save as > RIS
- Verify the diacritics are broken in an editor
- Apply patch
- Repeat and verify everything now displays correctly

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit bfeac6486516f185d9882d294d5000ab773c7dd5)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit ad2a3c5e8034d82edda187aa113029eb4f07b4bb)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 21013: Missing itemtype for checkut makes patron summary print explode
Owen Leonard [Thu, 14 Mar 2019 13:15:01 +0000 (13:15 +0000)]
Bug 21013: Missing itemtype for checkut makes patron summary print explode

This patch moves retrieval of the item type description from the script
to the template using the ItemTypes template plugin.

To test, apply the patch and locate an item which is checked out to
someone. Modify the database record for that item to remove the item
type (items.itype).

View the print summary for the patron who has that item checked out. The
page should display correctly. Checked-out items which have an item type
should show that item type description correctly.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit ea7245631ebfb16d4921a6cf7b4b46799a241ff9)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 1247af85216fc0664de8c667d282aa9c7e605f35)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 22068: (QA follow-up) Return meaningful error codes
Tomas Cohen Arazi [Fri, 5 Apr 2019 18:13:36 +0000 (15:13 -0300)]
Bug 22068: (QA follow-up) Return meaningful error codes

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit e98dacf9f1f8464f0db394da6bc1152f96713597)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 912a97f8b49b89d03ed524bed2072db0a50c4527)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 22068: Prevent patrons to cancel article request they did not create
Jonathan Druart [Thu, 14 Feb 2019 20:03:17 +0000 (17:03 -0300)]
Bug 22068: Prevent patrons to cancel article request they did not create

opac-article-request-cancel.pl doesn't check that the article request to
be cancelled actually belongs to the logged-in borrower. This results in
any logged-in user being able to cancel any article request just by
changing the id in the URL.

Test plan:
- Login with Patron P1, create an article request
- Cancel it
- Create another one
- Copy the cancellation link (must be /cgi-bin/koha/opac-article-request-cancel.pl?id=X)
- Login with Patron P2
- Hit the cancellation link
=> Without this patch the article request is cancelled
=> With this patch applied there is a 404 redirection

Note that the 404 will also appears when the article request id does not
exist.

Signed-off-by: Ere Maijala <ere.maijala@helsinki.fi>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 0b931d5de3c4fe9fa2b4823d9b8727b28a46aa7c)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit dc32211a8ea12e67453e5af9edaac0a73b52e2de)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 21003: Made Edit keywords more consistent in add_items-step2.tt
Hayley Mapley [Thu, 7 Mar 2019 20:28:48 +0000 (20:28 +0000)]
Bug 21003: Made Edit keywords more consistent in add_items-step2.tt

When adding a course reserve with a barcode that already exists, the
title, breadcrumbs, and legend of the form all specify that the user is
editing, and not adding, the book.

Test plan:
Same as comment 1

Signed-off-by: Devinim <kohadevinim@devinim.com.tr>
Signed-off-by: Bin Wen <bin.wen@inlibro.com>

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 41e0ff7cd6240c2c9ba2d1bec816b191ef091eb1)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit df88d3c87a11feb17b7949d2a3567220a07bc196)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 21003: Removed warning and changed wording on add_items-step2.tt
Hayley Mapley [Thu, 7 Mar 2019 02:50:12 +0000 (02:50 +0000)]
Bug 21003: Removed warning and changed wording on add_items-step2.tt

When editing an item in a Course Reserve, the page displayed is the same
that is displayed when adding an item to a Course Reserve. This patch
removes the warning 'This course already has this item on reserve' when
the item is being edited, as well as changes the title, breadcrumbs, and
header of the div. This patch also Changes the header of the div to say
'Edit 'book_name' in 'course_name'' instead of 'Add 'book_name' to
'course_name'' when adding items to a course reserve if the item is
already present.

To test:
1) Create a new course in Course Reserves (you will need Course
    Reserves enabled in syspref)
2) Add an item by clicking the Add reserves button
3) Click the edit button on the right hand side of the item listing
under the Reserves heading
4) Observe that the warning 'The course already has this item on reserve' appears, and that the title, breadcrumbs and
header of the div all say Add/Reserve
5) Apply the patch
6) Repeat step 3 and observe that the title, breadcrumbs and header of
the div now say Edit
7) Also verify that when adding a reserve with a barcode that does not
yet exist in the course reserves that the warning 'The course already...' is not displayed and that the header of the div says Add
8) Finally verify that when adding a reserve with a barcode that DOES
exist in the course reserves that the warning 'The course already...' IS
displayed and the header of the div says Edit
9) Sign off!

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 3eee6f3091fcb621152af7f4db6441c98cb74558)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 7c39ad305da2c337743fc5122c5a7b5220dea98f)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 12441: Search.pl conditional checks and displays using same syspref
Hayley Mapley [Thu, 14 Mar 2019 03:47:59 +0000 (03:47 +0000)]
Bug 12441: Search.pl conditional checks and displays using same syspref

Script search.pl checks OPACdefaultSortField and OPACdefaultSortOrder, but
shows defaultSortField and defaultSortOrder when using Advanced Search
in the staff client.

Test plan:
Apply the patch and then check that the Advanced Search uses
defaultSortOrder and defaultSortField sysprefs instead of the OPAC
sysprefs in the conditional. Check that sort behaviour in Advanced
Search still functions as expected. (It should do - this doesn't change
what displays, just improves consistency).

Sponsored-by: Catalyst IT

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

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit c786e4de2369de34ce26610309cbce53534446d3)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 8a2e6473d7c974a5a0cdccc49be7086789bc6c0e)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 10345: Increment copy number when adding multiple copies.
Björn Nylén [Thu, 28 Mar 2019 09:28:29 +0000 (10:28 +0100)]
Bug 10345: Increment copy number when adding multiple copies.

To test:
1. Add multiple copies of an item with data in the 'Copy number' field. Note that tha data will be identical for all items.
2. Apply patch.
3. Add multiple copies of an item with a positive integer (ie. only digits) in the 'Copy number' field. Note that the copy number is incremented for each item.
4. Add multiple copies of an item with some other type of data in the 'Copy number' field. Note that the copy number field remains unchanged for the added items.

Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault@inLibro.com>

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 0e0a3173859d4374087e99e1a7cd929c8da61c76)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 625265be742d27fb27e6b501df1e38e65ad1a878)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 22620: RMaint Follow-up reverting bad commit
Lucas Gass [Mon, 15 Apr 2019 17:20:29 +0000 (17:20 +0000)]
Bug 22620: RMaint Follow-up reverting bad commit

This reverts commit e7e66d4938427dd2e7d2be6f24c17bbb16bf7518.

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 22620: OPAC description for CCODE in opac-reserve.tt
Fridolin Somers [Tue, 2 Apr 2019 07:57:35 +0000 (09:57 +0200)]
Bug 22620: OPAC description for CCODE in opac-reserve.tt

Bug 20450 added CCODE to opac-reserve.tt using AuthorisedValues TT plugin.

This patch changes the plugin call so that it requests OPAC description.

Test plan :
1) Define a CCODE with staff and OPAC descriptions
2) Apply this collection on an item
3) At OPAC, place an hold on this item
4) Verify the collection display correctly OPAC description and not staff description

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 05e49e6be98723f67ec85a5843fad1fc9787925f)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 8a501d6e6368d7e72e349bf9909d62acfff6dd49)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 22575: Item type administration uses invalid error class for dialog
Owen Leonard [Tue, 26 Mar 2019 14:11:28 +0000 (14:11 +0000)]
Bug 22575: Item type administration uses invalid error class for dialog

This patch modifies the item types administration script so that it
passes a valid message type to the template, where the type is used as a
CSS class. "Error" is a nonexistent dialog class. It should be "alert."

To test, apply the patch and go to Administration -> Item types.

 - Try to delete an item type which is in use. The style of the error
   dialog should be correct.
 - Try to add an item type using a code which already exists. The error
   should look correct.

Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault@inLibro.com>
Signed-off-by: Bin Wen <bin.wen@inlibro.com>

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 40503c8fa86e6c4480ec8ca59e28f0c6f394502d)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 7f81521067d5fcca8ba399a280515ce8942c7284)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

7 months agoBug 22611: Correction for call to get create_item in EDI.pm
Colin Campbell [Mon, 1 Apr 2019 11:16:51 +0000 (12:16 +0100)]
Bug 22611: Correction for call to get create_item in EDI.pm

There was a typo in the addition of a call to
effective_create_items causing processing to abort after adding
a single copy.

This patch reverts to using the C4::Context call as used for the
first copy created, the intended call to effective_create_items
is a wrapper around that as the field in the basket is guaranteed
to be null (its not set when we call AddBasket). Being consistent
and explicit in what we call should guard against future changes
in dependencies exposing the logic flaw

Added some comments to make logical flow of code clearer

Signed-off-by: Liz Rea <wizzyrea@gmail.com>

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit f6bc67e851722451a970d085f51fb11fb03e21b3)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 4a2e88549505afbf28c2e0236f81012789262496)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

8 months agoBug 21049: Set 007/00 when selecting material type (Rancor)
Julian Maurice [Fri, 8 Mar 2019 09:12:50 +0000 (10:12 +0100)]
Bug 21049: Set 007/00 when selecting material type (Rancor)

There is a 1-1 relationship between the material type values and the
position 00 of 007 field. Selecting a material type should set this
position's value.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 856425db1e156ee4faf1aae70b0a78845711ba43)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 16e250542de43eadf62bc9354329912be84c3420)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

8 months agoBug 21049: Fix value of material select for Rancor 007 widget
Julian Maurice [Wed, 6 Mar 2019 07:43:18 +0000 (08:43 +0100)]
Bug 21049: Fix value of material select for Rancor 007 widget

The material type is selected in accordance with position 0 of 007

Test plan:
1. Create a new record using the advanced editor
2. Select a material type for field 007 and set at least the position 0
   of this field
3. Save the record and reload the page
4. The material type should remain selected
5. Try with all available material types

Signed-off-by: Liz Rea <wizzyrea@gmail.com>

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit e85294a738da7cce2a4897998ffa795f977b4cd7)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit d5aa7655a643a5a4868a47b8aae5371438993580)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

8 months agoBug 22536: Display problem in Holds to Pull report
Owen Leonard [Tue, 19 Mar 2019 12:41:26 +0000 (12:41 +0000)]
Bug 22536: Display problem in Holds to Pull report

This patch modifies the display of several values in the holds to pull
report so that they can be displayed as lists instead of as chunks of
HTML generated in SQL.

This patch modifies the SQL in pendingreserves.pl so that values can be
formatted in the same way that holding branch is. The better long-term
solution is to remove SQL from pendingreserves.pl altogether, but this
is a quick fix.

This patch also makes a couple of minor markup changes to fix
validation.

To test, apply the patch and go to Circulation -> Holds to pull. To see
the changes the patch makes your holds to pull list should have titles
with multiple items at multiple branches, with call number, copy number,
and enumeration data. These values should all be displayed in bulleted
lists.

Signed-off-by: David Roberts <david.roberts@ptfs-europe.com>
Signed-off-by: Bin Wen <bin.wen@inlibro.com>

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 9a321c128fed457bf6d11d2ce7ee7edf7dd28004)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 38bbe82aa07aa9a1a3cc33e00b5b8e459eb28a30)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

8 months agoBug 22560: Forgotten password "token expired" page still shows boxes to reset password
Owen Leonard [Fri, 22 Mar 2019 13:19:51 +0000 (13:19 +0000)]
Bug 22560: Forgotten password "token expired" page still shows boxes to reset password

This patch modifies the OPAC password recovery template so that the new
password entry form doesn't appear if the patron has followed an invalid
or expired link.

This patch also corrects the markup in the page title.

To test, apply the patch and follow the process for resetting a
forgotten password. When you follow the password recovery link, modify
the URL so that the "uniqueKey" parameter is different.

The page should show an error message. The password entry form should
not appear.

Check the page title in the browser's title bar. It should look correct.

https://bugs.koha-community.org/show_bug.cgi?id=22520

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 7ac1457ffc27cf6ec5a3a7bab6abc8a010e02b6a)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 34e0f9874f91b22c8fd24f76de74bb3c126d2a1e)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

8 months agoBug 22561: Forgotten password requirements hint doesn't list all rules for new passwords
Owen Leonard [Fri, 22 Mar 2019 12:57:31 +0000 (12:57 +0000)]
Bug 22561: Forgotten password requirements hint doesn't list all rules for new passwords

This patch modifies a few templates in the OPAC so that all available
information on password requirements is displayed for each case where
the patron is setting a password:

 - If the RequireStrongPassword system preference is set, a message
   should appear listing strong password requirements and minimum
   password length.
 - If RequireStrongPassword is not set, the message should only ask for
   a minimum password length.

To test, apply the patch and enable the PatronSelfRegistration and
OpacResetPassword preferences.

On the following pages, test with RequireStrongPassword both on and
off. The correct messages should appear.

 - OPAC -> Forgot password. Follow the process to reset your password
   until you reach the step where you are entering the new password.
 - OPAC -> Register here. Check the password section of the registration
   form.
 - OPAC -> Log in -> Change your password.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 50be1c4006e0a1d7e3b537bd849bc77f7a6bb56f)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit e3e64974d830a8699e8648a82d21a7ffce502955)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

8 months agoBug 17746: (QA follow-up) Make set_password.pl generate a password if required
Tomas Cohen Arazi [Wed, 20 Feb 2019 14:26:40 +0000 (11:26 -0300)]
Bug 17746: (QA follow-up) Make set_password.pl generate a password if required

This patch makes the set_password.pl script generate the password if it
is not passed as an argument.

It also changes the behaviour of set_password.pl: it will now print the
userid and password (generated or not) to mimick the behaviour from
koha-reset-passwd.

The koha-reset-passwd gets simplified as it doesn't generate the random
password anymore, it passes the responsability to set_password.pl

To test:
- Follow the steps from the original platch
- Verify all behaves as expected

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

Signed-off-by: Liz Rea <wizzyrea@gmail.com>

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 3ef48c8708736e9d5b16e462e520302c007cb4c1)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 3b423071227ee3f9300907bb9e89cff26012aa29)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

8 months agoBug 17746: Add misc/admin/set_password.pl script
Tomas Cohen Arazi [Mon, 4 Feb 2019 18:09:34 +0000 (15:09 -0300)]
Bug 17746: Add misc/admin/set_password.pl script

This patch introduces a script that allows changing a patron's password.
The change overrides the defined password enforcement policy.

If multiple conditions are passed to match on the patron, they all need
to match. Otherwise an error message is printed.

Attributes to search the patron on:
- cardnumber
- patron_id (a.k.a. borrowernumber)
- userid

we usually know some of them, but if we specify more than one, they need
to match a patron, together.

To test:
1) Apply this patch
2) Have a known patron (i.e. you know the cardnumber, the borrowernumber
   and the userid).
3) Run:
  $ kshell
 k$ perl misc/admin/set_password.pl --cardnumber <the_card_number> \
                                    --password a_password
4) Verify you can login with the new password
5) Repeat 3) through 5) with --patron_id and --userid
=> SUCCESS: You can login in all cases
6) Try combining some or all the parameters
=> SUCCESS: It fails when it should, it succeeds when it should
7) Sign off :-D

Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault@inLibro.com>

Signed-off-by: Liz Rea <wizzyrea@gmail.com>

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit e2f6542e1ebbd15977b47c86d2a9ef55fa0c5e9b)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 54de33967101173c72865e97fce0fd220e2d0842)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

8 months agoBug 17746: Make koha-reset-passwd user set_password.pl
Tomas Cohen Arazi [Tue, 5 Feb 2019 17:04:12 +0000 (14:04 -0300)]
Bug 17746: Make koha-reset-passwd user set_password.pl

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

Signed-off-by: Liz Rea <wizzyrea@gmail.com>

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 0cd4ca289bd2e1bd11fdbd015225a909971ce213)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit ac1fdfe2258940cf4b7003d816b0e1723ed8963c)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

8 months agoBug 13735: Update PrepareItemrecordDisplay to use maxlength
Katrin Fischer [Wed, 6 Feb 2019 02:02:11 +0000 (02:02 +0000)]
Bug 13735: Update PrepareItemrecordDisplay to use maxlength

The PrepareItemrecordDisplay method used to generate the item
display on receiving serials was using a hardcoded maxlength
of 255 on input fields. This patch updates it to use the
maxlength defined in the frameworks instead as the normal
item form does.

To test:
- Create or reuse an existing subscription
- Make note of the framework the record uses
- Add an item on receive
- Check the maxlength on the various fields is set to 255
  (check source code or use developer tools)
- You can also verify that by adding a long note to
  one of the note fields
- Apply patch
- Repeat tests, the maxlength should now be 9999
- In your framework settings, change the length of one
  of the subfields to another value
- Verify that the item form reflects the change

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

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 0429aadc217f05a98bbaa51f955b835ac552fd7a)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 1c267af1438d31a967593f942321d040cd26d34e)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

8 months agoBug 21130: (Follow up OPAC Results) Prevent HTML class from being translated
Blou [Tue, 11 Sep 2018 18:42:03 +0000 (14:42 -0400)]
Bug 21130: (Follow up OPAC Results) Prevent HTML class from being translated

This fixes the same issue where "title" is being translated (in fr-CA at least) and thus
break the javascript impacting the result display in the OPAC

Signed-off-by: Hayley Mapley <hayleymapley@catalyst.net.nz>

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 5334e0f32a8b93c407c2bfc931397a0ae70b8d64)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit afce1b2a92ba186db56ed225d2b242158be4bd0c)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

8 months agoBug 21130: Prevent HTML class from being translated
David Bourgault [Fri, 27 Jul 2018 21:13:42 +0000 (17:13 -0400)]
Bug 21130: Prevent HTML class from being translated

Adds a xsl:value-of tag to prevent the value from being translated.

TEST PLAN
0) Apply patch
1) Translate
2) In the opac, div.record has not changed

NOTE:
I don't know if this bug affects all translations, I noticed it when translating to fr-CA.
The fix will work for all languages.

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit e64fb90311a9f2b37b49fc670962089cbb3d32de)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 84787c1eee9db11f779273ba5f83ddd4d8f91efb)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

8 months agoBug 13763: (follow-up) Strip leading whitespace characters from input barcode
Josef Moravec [Wed, 20 Mar 2019 15:52:07 +0000 (15:52 +0000)]
Bug 13763: (follow-up) Strip leading whitespace characters from input barcode

this makes the work with barcodes from input consistant on checking out,
     checking in and renewing

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 28ff4f6393e65ebfca60c05611fafc926f1fb239)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 2712e1ee55208332db4ec01310f58b8fa0b882c6)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

8 months agoBug 13763: Added check for filter syspref in renew.pl
Hayley Mapley [Thu, 14 Mar 2019 04:58:31 +0000 (04:58 +0000)]
Bug 13763: Added check for filter syspref in renew.pl

In Circulation->Renew, the renew feature does not check the system
preference itemBarcodeFilter to see whether the barcode needs to be
converted. This patch fixes this, adding a check for the system pref and
applying it accordingly to convert the barcode if it is needed.

Test plan:
1) In Circulation->Renew, enter a barcode that you know exists in the
catalogue but add extra spaces, breaking up the barcode. Note that this
fails with a warning that says 'No item matches this barcode'

2) In system Preferences, set the itemBarcodeInputFilter pref to Remove
spaces and repeat step1. Note that the result is the same as in step 1

3) Apply the patch

4) Repeat step 1, and note that the filter removes the spaces and the
item is renewed (or gives an error that indicates it recognises the
barcode)

Sponsored-by: Catalyst IT
Signed-off-by: Bin Wen <bin.wen@inlibro.com>

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 48e9082043115416063e66217db60f0054b68088)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 4505ad4dc52c5384866c157c08ba6a5a6c95a619)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

8 months agoBug 21832: add is_expired to ILS-DI example
Fridolin Somers [Thu, 7 Mar 2019 13:46:29 +0000 (14:46 +0100)]
Bug 21832: add is_expired to ILS-DI example

Test plan :
1) Apply patch
2) Enable ILS-DI
3) Go to <opac URL>/cgi-bin/koha/ilsdi.pl?service=Describe&verb=GetPatronInfo
4) Check you see is_expired in example response

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit c0df2d0e8612e1ca428f51462fcfb99fbc3f0009)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit fffb7b3c6a3762683920aa5448a6128944bf21e1)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

8 months agoBug 21832: add unit test
Fridolin Somers [Tue, 12 Feb 2019 14:52:22 +0000 (15:52 +0100)]
Bug 21832: add unit test

Adds a check that is_expired exists in service GetPatronInfo.

Test plan :
Run : prove t/db_dependent/ILSDI_Services.t

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

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Amended patch: remove ref to bug number, we have git for that

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 20ce110f5c656f51bad262708d4b577568c1a52a)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 4e305856af7b713868206e385fb1abac7a79a9d8)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>