[koha-commits] main Koha release repository branch master updated. v17.05.00-190-gd9c8eea
Git repo owner
gitmaster at git.koha-community.org
Thu Jul 6 20:50:02 CEST 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, master has been updated
via d9c8eea442bbe4e30be172d547e519dcd781341d (commit)
via df4a87d4a69761715791a10cbf94383af345350d (commit)
via a78bb5ba1c51d995a597cb0ac7e5e9f95345ed3e (commit)
via 29a1f0fd9cb98473157e72b5782cb8bbd6623a51 (commit)
via 65c32eee8eef7102544a579a2a68c7ebb4a6b0bd (commit)
via e29163af4cde7ce33060716091726e6fa2eef65e (commit)
via 3829020c2664ec531354f78f0c04d00f5dd6795d (commit)
via e3bf4fc8bb821456305d587a8d49fe39b07abd06 (commit)
via 8a0ecda6c4ff368b9ff7a18593d7bdf4fc07e541 (commit)
via ce176fd170227456fa725e5f1f2f6b1b04fd044d (commit)
via 23b84c0b6532d9c42894b648891d835e7624db49 (commit)
via e48a5fb560123bac31e9a692026601ddd320f966 (commit)
via f40c093c19e21c6a8aa7a41d4e51fc4e3fc1d8e9 (commit)
via b94b16f67963b03fd17170d2c2f2efa581c12c0f (commit)
via ebb887e5c93c96c6fc51d95b76de6a221ba4463e (commit)
via d222da0602ba96f08cc6c026f39451b0aa7de01e (commit)
via 0d98089ec701bc96893e68408ce2dedad36f7235 (commit)
via 83e4adf0abff0e81febf4bcee473ce9c599e8311 (commit)
via aa03981e79a10bd5a032f13533d93f0b87bd37f7 (commit)
via c1112236f908626b273f7dc950807ce2e085db2d (commit)
via 540d488e980b2521b424bed0f0267002c6dbd03e (commit)
via 241be8ff1ae24fff6165c8d6877945637467ee9a (commit)
via 3b5529c3abca87afb4f66f5bc7d3aa0fe005c1aa (commit)
via 9eb88f588bd13ddf25135c26acd905abe71f326a (commit)
via 2d19a34529bc313922a085a99288e55d8634c8b6 (commit)
via 8b15c064405ff4a48cb3f5803dd6bd16d49d5b9b (commit)
via 0c09adbfc87b950b9f08aebede131ba694997290 (commit)
via a81947782bb884feccd5401499f1a6e8f469b0b0 (commit)
via 520d1acac832fe299408eb393daaa5e434e88927 (commit)
from 60e55c857c0e59693eaea138fbcc025f0de23960 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d9c8eea442bbe4e30be172d547e519dcd781341d
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jun 23 10:12:44 2017 +0200
Bug 18104: [QA Follow-up] Add a test for customized name in AE
Test plan:
Run t/db_dependent/SIP/Message.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit df4a87d4a69761715791a10cbf94383af345350d
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Mar 6 12:05:31 2017 +0000
Bug 18104 - allow SIP2 field AE (personal name ) to be customized
Koha's SIP2 server sends the patron's name in the format "Firstname
Surname" which is not very good for machine reading. We need to allow
the format of the patron name to be customized in a manner similar to
what is done with the DA field on bug 16755.
Test Plan:
1) Apply this patch, start or restart your SIP server
2) Find a patron with a first and last name
3) Send a patron information request via the sip2 cli tool
4) Note the AE field has the format "<firstname> <surname>" ( i.e. the current behavior )
5) Add this parameter to the login stanza you are using:
ae_field_template="[% patron.surname %][% IF patron.firstname %], [% patron.firstname %][% END %]"
6) Restart your SIP server
7) Repeat step 3
8) Note the AE field now has the format "<surname>, <firstname>"
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Benjamin Daeuber <BDaeuber at cityoffargo.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit a78bb5ba1c51d995a597cb0ac7e5e9f95345ed3e
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Dec 29 14:22:04 2016 +0000
Bug 16755 - allow SIP2 field DA ( hold patron name ) to be customized
The SIP2 DA field that Koha transmits is an odd and arbitrary format
that some SIP2 clients cannot handle. It would be best if this
format were customizable on a per-login basis in the same manner as
the AV field.
Test Plan:
1) Find an item that is checked out with holds
2) Return the item via SIP2 ( using the SIP2 cli emulator )
3) Note the value of the DA field
4) Apply this patch, restart your SIP2 server
5) Repeat step 2
6) Note the DA field value has not changed
7) Add this parameter to the login stanza you are using:
da_field_template="[% patron.surname %][% IF patron.firstname %], [% patron.firstname %][% END %]"
8) Restart the SIP2 server again
9) Repeat step 2
10) Note the DA field returned is now in the format "$surname, $firstname"
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Benjamin Daeuber <BDaeuber at cityoffargo.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 29a1f0fd9cb98473157e72b5782cb8bbd6623a51
Author: Marc Véron <veron at veron.ch>
Date: Fri Jun 23 18:48:00 2017 +0200
Bug 18465: (followup) Fix issue with patron lists an do not use clone
This followup fixes duplex printing with patron lists.
Additionaly, it uses simple copy instead of clone and removes a
superfluous line, see comments #15 - #17
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 65c32eee8eef7102544a579a2a68c7ebb4a6b0bd
Author: Marc Véron <veron at veron.ch>
Date: Thu Apr 20 20:43:11 2017 +0200
Bug 18465 - Patron card creator: Print on duplex card printer
Card printers with duplex functionality need as input a PDF file where odd pages contain
the front side and even pages the back side of the cards.
This patch adds such functionality.
To prepare test:
- In Patron card creator > Templates, prepare a 1 up template (1 column / 1 row) that
fits to a single card. Give it a name like 'Duplex card template'
(Attention, Card with and Card height seem to have wrong labels, that will go
to a separate bug).
- In Patron card creator > Layouts create a layout for the front side and one for
the back side. Give them names to easily remember (Card front layout, Card back layout)
- Go to Patron card creator > Batches and test both layouts together with the
1 up template. Save and keepp both test files as reference.
To test:
- Apply patch. Restart memcached and plack.
- Go to Patron card creator > Batches
- Click "Export" for a batch
- In the following screen, note the new field "Select a layout for the back side"
with a hint what it is used for
- Leave it on 'Back side layout not used', export and compare output with test ooutput
from preparation. It should be the same
- Select the layout you prepared for the back side.
- Export - this file should contain 2 PDF pages per patron, one first with the
front side, second with the back side.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit e29163af4cde7ce33060716091726e6fa2eef65e
Author: David Kuhn <techservspec at gmail.com>
Date: Tue Jun 6 09:38:07 2017 -0700
Bug 18616 - The "Add forgot password link to OPAC" should allow patrons to use their library card number in addition to username
Allow patrons to enter either their library card number or user name in the "Log in" box for password recovery.
Most patrons at our library use their card number to log in and are unaware of what their userid is. However there are some who have set a
customized userid and would prefer to use that. This patch would allow either to be entered for password recovery.
To test:
1. Enable the password recovery feature.
2. In the OPAC, click on "Forgot you password?" link and enter a valid library card number.
3. The error message "No account found with the provided information" appears.
4. Apply the patch.
5. Repeat step 2. The recovery email is now sent.
Note: Moved patch from 16711 back here and re-tested.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 3829020c2664ec531354f78f0c04d00f5dd6795d
Author: Marc Véron <veron at veron.ch>
Date: Sun May 21 18:28:48 2017 +0200
Bug 16711: OPAC Password recovery: Handling if multiple accounts have the same mail address
To reproduce:
- Create 3 Accounts, login names are test01, test02, test03, Email is the same
for all.
- Go to OPAC -> Password recovery and indicate E-Mail only
- You will get an email for only one of the accounts above.
To test:
- Apply patch, restart memcached and plack
- Go to db, delete from borrower_password_recovery;
- Try steps above to reproduce. You will get an error message:
Account identification with this email address only is ambiguous.
Please use the field 'Login' as well.
- Verify that other cases work as before (provide valid / invalid login only,
provide valid email for an existing account, provide unknown email, provide
both login and email with all combinations of valid / invalid)
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Bug 16711: (QA-followup) Use count directly
See comment # 13
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit e3bf4fc8bb821456305d587a8d49fe39b07abd06
Author: Lee Jamison <ldjamison at marywood.edu>
Date: Thu Jun 22 16:42:15 2017 +0000
Bug 18848: borrowers.lastseen comment typo
Typo in comment for the lastseen column in the borrowers table.
To test:
1. Verify lastseen column displays "last time a patron has been seed"
2. Apply patch
3. Verify lastseen column changed to "last time a patron has been seen"
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 8a0ecda6c4ff368b9ff7a18593d7bdf4fc07e541
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Tue Jun 20 16:35:35 2017 +0100
Bug 18830: Fix phrasing of screen message
Verb should be plural in this message
Signed-off-by: Israelex A Veleña for KohaCon17 <israelex19 at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ce176fd170227456fa725e5f1f2f6b1b04fd044d
Author: Marc Véron <veron at veron.ch>
Date: Mon Jun 19 21:23:54 2017 +0200
Bug 18824: Remove stray i from matching-rules.tt
The file
koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
contains a stray i that should not be there.
This patch removes it.
Signed-off-by: Chris Kirby <chris.kirby at ilsleypubliclibrary.org>
Applied patch.
Checked line 516. Stray i had been removed.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 23b84c0b6532d9c42894b648891d835e7624db49
Author: Lee Jamison <ldjamison at marywood.edu>
Date: Thu Jun 22 16:42:15 2017 +0000
Bug 18848: borrowers.lastseen comment typo
Typo in comment for the lastseen column in the borrowers table.
To test:
1. Verify lastseen column displays "last time a patron has been seed"
2. Apply patch
3. Verify lastseen column changed to "last time a patron has been seen"
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit e48a5fb560123bac31e9a692026601ddd320f966
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Jul 3 09:31:52 2017 +0200
Bug 18881: [QA Follow-up] Remove even more
Removing the commented section from the template: If it does not work, it should not be here.
When it works again, put it back in.
Since @itemtypesloop is not used, remove it from the script too.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit f40c093c19e21c6a8aa7a41d4e51fc4e3fc1d8e9
Author: Marc Véron <veron at veron.ch>
Date: Fri Jun 30 20:20:44 2017 +0200
Bug 18881: Remove dead code from view_holdsqueue.pl
Aleisha spotted the typo in $itemtypes and proposed a correction on bug 18859.
The description was not even used. Template calls GetDescription.
To test:
Verify that viewing the holds queue still works as expected.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit b94b16f67963b03fd17170d2c2f2efa581c12c0f
Author: Rodrigo Santellan <rsantellan at gmail.com>
Date: Wed Jun 21 15:40:43 2017 -0300
Bug 14572 - insert_single_holiday() forces a value on an AUTO_INCREMENT column, during an INSERT
Removing all the id from the columns on the inserts and removing the
parameter '' of the values for the id.
Test plan:
1) Go to tools -> calendar
2) Add a Holiday only on this day.
3) Add a Holiday repeated every same day of the week.
4) Add a Holiday repeated yearly on the same date.
5) Add a Holidays on a range.
6) Add a Holidays repeated yearly on a range.
7) You should have the five calendars displayed.
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ebb887e5c93c96c6fc51d95b76de6a221ba4463e
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Thu Jun 8 12:59:55 2017 +0100
Bug 18755: Allow empty passwords in Patron Info to return OK
With this patch a parameter 'allow_empty_passwords="1" can be added to a
login in the SIP configuration file to allow the behaviour as was normal
before the patch for bug 16610 was applied. Some sip clients rely on
this behaviour sending an empty password field when they wish to
validate to user but do not have the password.
If a password is supplied it will be validated
A test has been added to Message.t to confirm this behaviour
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d222da0602ba96f08cc6c026f39451b0aa7de01e
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Fri Jun 9 13:01:14 2017 -0400
Bug 18771: CGI.pm: Subroutine multi_param redefined
The commands in the test plan are examples, and may need varying
depending on your installation. This was created as a result
of attempting to clean the installation process up. However,
I believe the redefine might exist normally too. I just didn't
check. This is tested on a Debian 8 box sudo apt-get update'd
fully.
TEST PLAN
---------
empty error log
$ echo > ~/koha-dev/var/log/koha-error_log
drop and recreate and empty db
> drop database koha_library;
> create database koha_library;
> quit
run the web installer, but DO NOT LOG IN!
*opening chrome to Staff Client URL*
check the error log
$ less ~/koha-dev/var/log/koha-error_log
...
[Fri Jun 09 13:08:52.793627 2017] [cgi:error] [pid 5802] [client 192.168.71.101:58169] AH01215: [Fri Jun 9 13:08:52 2017] CGI.pm: Subroutine multi_param redefined at /usr/share/perl5/CGI.pm line 419.
...
apply patch
empty error log
$ echo > ~/koha-dev/var/log/koha-error_log
refresh the installation login page
recheck the error log
$ less ~/koha-dev/var/log/koha-error_log
notice no reference to "Subroutine multi_param redefined"
run koha qa test tools
Notice that it is just a require CGI; and comment added.
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 0d98089ec701bc96893e68408ce2dedad36f7235
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Jun 14 15:37:55 2017 +0200
Bug 18634: Handle colliding translation for preference sections
Problem on this report was caused by translating the tabs Privacy
and Payments by the same string. This caused overwriting a hash entry.
This patch tests if the key already exists and if so, it merges the
entries instead of overwriting the old contents.
Test plan:
[1] Make sure that e.g. Privacy and Payments translate to e.g Vie privee.
[2] Run translate install fr-CA (or the language you altered)
[3] Without this patch you should loose preferences from either Privacy or
Payments. With this patch, they should be merged.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Tested with fr-CA.
Signed-off-by: Blou <philippe.blouin at inlibro.com>
Reset the .po files, reproduced the problem. Applied the patch and suddenly 'paypal' appeared.
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 83e4adf0abff0e81febf4bcee473ce9c599e8311
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jul 6 14:28:18 2017 -0300
Bug 18801: DBRev 17.05.00.003
commit aa03981e79a10bd5a032f13533d93f0b87bd37f7
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Jun 15 15:47:21 2017 +0200
Bug 18801: [Follow-up] Dbrev to repair bad auth type codes
Test plan
Run updatedatabase.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit c1112236f908626b273f7dc950807ce2e085db2d
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Jun 14 09:19:10 2017 -0400
Bug 18801 - Merging authorities has an invalid 'Default' type in the merge framework selector
To test:
1 - Find two authorities and start a merge
2 - Leave the dropdown at 'Default'
3 - Merge records and note you get an error and can no longer view the
new record
4 - Check DB value of record authtypecode = 'Default'
5 - Apply patch
6 - Find two other authorities
7 - Merge leaving selector at default
8 - Success
9 - Check DB value of record authtypecode = ''
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 540d488e980b2521b424bed0f0267002c6dbd03e
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Jul 3 09:42:21 2017 +0000
Bug 18434 - Followup fix tests for sorting and factes
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 241be8ff1ae24fff6165c8d6877945637467ee9a
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jun 16 10:01:12 2017 -0400
Bug 18434 - Followup - same changes for sort and facet fields
To test:
1 - Index some stuff with multiple fields defined for sorting
i.e. Authorites - make heading sortable - default is 110a and 111a for
heading - a record with 111a empty will make the sort field empty
2 - view the record:
curl http://localhost:9200/koha_kohadev_authorities/data/30?pretty=true
3 - Note the blank field
4 - Apply patch
5 - Reindex
6 - Fields should be correctly populated
Unit tests to follow (once I have the originals working for all)
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 3b5529c3abca87afb4f66f5bc7d3aa0fe005c1aa
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon May 15 11:46:00 2017 -0300
Bug 18434: (QA followup) Move _convert_marc_to_json tests into Indexer.t
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9eb88f588bd13ddf25135c26acd905abe71f326a
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Apr 14 10:03:11 2017 -0400
Bug 18434: Elasticsearch indexing broken with newer catmandu version
To test:
1 - Make sure you have latest koha deps, catmandu versions should be:
libcatmandu-marc-perl 1.09-1~kohadev1
libcatmandu-perl 1.0304-2~kohadev1
2 - Reindex elastic
3 - Try searching and likely notice odd results
4 - Try:
curl -XGET
'http://localhost:9200/koha_kohadev_biblios/data/792?pretty=true'
with a known biblionumber and notice some null fields
5 - Apply patch
6 - Reindex
7 - Note fields are populated and search works as expected
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 2d19a34529bc313922a085a99288e55d8634c8b6
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri May 12 15:39:25 2017 -0300
Bug 18434: Add tests for K:SE:E::get_fixer_rules
This patch tries to introduce exhaustive tests for this class method.
I didn't try to provide a regression test for the current bug per-se, but
cover the current method behaviour as much as I could.
(kidclamp) I added a quick test of _convert_marc_to_json to use the mocking here
and illuminate what the change does, before the patches this should
fail (fields are indexed in place of one another), after it should succeed (new indexed fields are appended).
A minor bug is highlighted by this new tests, I'll provide a followup for it.
To test:
- Run:
$ sudo koha-shell kohadev
k$ de kohaclone
k$ prove t/db_dependent/Koha_Elasticsearch.t
=> FAIL: The returned fixer rules are not the expected ones
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 8b15c064405ff4a48cb3f5803dd6bd16d49d5b9b
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Wed Jun 14 12:33:25 2017 +0200
Bug 18756 - add Unit Test
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 0c09adbfc87b950b9f08aebede131ba694997290
Author: Christophe Croullebois <christophe.croullebois at biblibre.com>
Date: Thu Jun 8 13:17:56 2017 +0000
Bug 18756: Users can view aq.baskets even if they are not allowed
Due to bad use of grep syntax if there is one or more Basket Users the result of grep is not equal to 0 and the borrower is allowed.
Test plan :
1- select system preference 'AcqViewBaskets' on 'user'
2- create 2 borrowers (A, B) with only permissions on acquisition :
group_manage
order_manage
order_receive
staff
3- login with A and create a basket
4- add a basquet manager other than B
5- relog with account B
6- you can see the basket
Apply the patch.
The basket is no longer visible.
1- relog with A
2- add basquet manager B
3- relog with B
5- you must see the basket
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit a81947782bb884feccd5401499f1a6e8f469b0b0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jul 5 20:03:24 2017 -0300
Bug 18870: Force scalar context for Koha::Club methods
These 2 methods are called from the template in list context.
However since bug 18539 Koha::Objects->find can no longer be called in
list context.
Forcing the context to scalar fixes the problem and should not
introduced side-effects.
Test plan:
- Create a club template
- Create a club using this template
=> Without this patch you should no longer get the following error:
Template process failed: undef error - Cannot use "->find" in list
context at /home/vagrant/kohaclone/Koha/Club.pm line 51.
Signed-off-by: Aleisha Amohia <aleishaamohia at hotmail.com>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 520d1acac832fe299408eb393daaa5e434e88927
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jul 6 13:58:05 2017 -0300
Bug 18228: DBRev 17.05.00.002
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 4 +-
C4/Calendar.pm | 8 +-
C4/Context.pm | 1 +
C4/SIP/ILS/Item.pm | 18 ++-
C4/SIP/ILS/Patron.pm | 20 +++
C4/SIP/Sip/MsgType.pm | 11 +-
Koha.pm | 2 +-
Koha/Club.pm | 4 +-
Koha/SearchEngine/Elasticsearch.pm | 6 +-
circ/view_holdsqueue.pl | 14 --
etc/SIPconfig.xml | 2 +
installer/data/mysql/atomicupdate/bug18228.perl | 30 -----
installer/data/mysql/kohastructure.sql | 4 +-
installer/data/mysql/updatedatabase.pl | 54 ++++++++
.../prog/en/modules/acqui/invoices.tt | 2 +-
.../prog/en/modules/admin/matching-rules.tt | 2 +-
.../prog/en/modules/authorities/merge.tt | 1 -
.../prog/en/modules/circ/view_holdsqueue.tt | 11 --
.../prog/en/modules/help/patroncards/manage.tt | 3 +-
.../prog/en/modules/patroncards/print.tt | 19 ++-
.../bootstrap/en/modules/opac-password-recovery.tt | 5 +-
misc/translator/LangInstaller.pm | 7 +-
opac/opac-password-recovery.pl | 23 +++-
patroncards/create-pdf.pl | 22 +++-
patroncards/print.pl | 5 +
t/Acquisition/CanUserManageBasket.t | 9 +-
t/db_dependent/Koha_Elasticsearch.t | 138 +++++++++++++++++++-
t/db_dependent/Koha_Elasticsearch_Indexer.t | 73 ++++++++++-
t/db_dependent/SIP/Message.t | 18 ++-
29 files changed, 413 insertions(+), 103 deletions(-)
delete mode 100644 installer/data/mysql/atomicupdate/bug18228.perl
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list