[koha-commits] main Koha release repository branch master updated. v18.05.00-231-g9bfb3bc
Git repo owner
gitmaster at git.koha-community.org
Fri Jul 13 13:17:34 CEST 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, master has been updated
via 9bfb3bc3782dd6b516d0144074b57e55cbefae2e (commit)
via 3e0aa0f3191a570dceb834e4036932d9af3c820e (commit)
via 9d596553369b2500d0e629aec1b085aa3836190a (commit)
via 4ee390cbb7ce0726c4d80c4581ef1a387abb47ce (commit)
via 0fb5019b7142396f0cd2cec1132dba767b0c64b2 (commit)
via 1d54746cb2635a7cdec07a37e7ebacfa422d6365 (commit)
via 19227359a197ae19a6d013c3e0f07a54173d1a46 (commit)
via d421cfaed55df1404a9242cfbbf9ad95c0a2ccf5 (commit)
via 1debd8bf81f2db8c5e222083ed5104539972db89 (commit)
via 4b8bcd9be9e820f3d63d36f787eec30b439cb977 (commit)
via e41387016e3673c1358fd1c99efde28d03d1883c (commit)
via 7d6cdf9c2a6c7920769d7a8e8d4d355a8d393413 (commit)
via ea184236a493fdc1267253662838ed64f72139ef (commit)
via d38a0404811427e333014ebae9e9df83736dc540 (commit)
via 95b1983a25dcca14700e7251f94fde43f78f6911 (commit)
via 78b9a3e4509b3b8dcc4d76cffd3ed3f7f4952543 (commit)
via cc131475eda2871afa2e5a4cf8f6f7191af06b31 (commit)
via 2414a4e7056656843696aca19a75acebb577745a (commit)
via 82e0e97a0081ce75c334ca3073d385e53f21d51c (commit)
via 27de9a3e5d2ea7b803852649836b9442b10896f7 (commit)
via bcba640f115e07480c502c2bf8522acdb9d8d5df (commit)
via a6b8fc9b2e29b91cef62def4f8b4fed98efa9aea (commit)
from 68ff8702e09be9879d508ea82c0ef7fab53c0ee9 (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 9bfb3bc3782dd6b516d0144074b57e55cbefae2e
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Jul 2 15:59:54 2018 -0300
Bug 20990: (QA follow-up) make outstanding_credits return the account lines only
This patch was discussed with Jonathan on a QA conversation. It is
better to keep this simpler and more reusable. And is the right approach
in this case.
This patch makes Koha::Account::outstanding_credits return the account
lines, code that used the $total value, will just use
$lines->total_outstanding;
Tests are adjusted accordingly.
To test:
- Run:
$ kshell
k$ prove t/db_dependent/Koha/Account.t
=> SUCCESS: Test pass.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 3e0aa0f3191a570dceb834e4036932d9af3c820e
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Jun 26 14:31:40 2018 +0000
Bug 20990: Make same changes that were made to outstanding_debits
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 9d596553369b2500d0e629aec1b085aa3836190a
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Mon Jun 25 18:57:20 2018 +0000
Bug 20990: (follow-up) Fix test description
Test plan:
prove -v t/db_dependent/Koha/Account.t
--> Test message of first test of subtest outtanding_credits correctly says
"Outstanding credits total..."
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 4ee390cbb7ce0726c4d80c4581ef1a387abb47ce
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Jun 25 11:15:14 2018 -0300
Bug 20990: Add Koha::Account->outstanding_credits
This patch adds a method that retrieves (for a patron's account) the
outstanding credits (i.e. those that haven't been applied to any debit.
To test:
- Apply this patches
- Run:
$ kshell
k$ prove t/db_dependent/Koha/Account.t
=> SUCCESS: Tests pass!
- Sign off :-D
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 0fb5019b7142396f0cd2cec1132dba767b0c64b2
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Jun 25 11:15:08 2018 -0300
Bug 20990: Unit tests for Koha::Account->outstanding_credits
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 1d54746cb2635a7cdec07a37e7ebacfa422d6365
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Jun 6 14:54:58 2018 +0000
Bug 6647: Label item search should use standard pagination routine
This patch doesn't fix how pagination links are generated for the label
item search results, but it does modify the template so that the
pagination links are styled like they are on catalog search results.
To test, apply the patch and go to Tools -> Labels.
- Open or create a label batch.
- Click "Add items" to trigger the pop-up search window.
- Perform a search which would return multiple results.
- Confirm that the style of the pagination bar matches the one on the
catalog search results page.
- Confirm that current-page number highlighting works correctly.
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 19227359a197ae19a6d013c3e0f07a54173d1a46
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jun 14 11:31:02 2018 -0300
Bug 20919: Remove unecessary search calls on the biblio detail page
There is a countanalytics flag that is set for items used in analytical
biblio records. This flag is only used in the template when 'analyze'
has been passed to the script.
In order to avoid unecessary search calls (1 per item), $analyse must be
tested.
Test plan:
0. Do not apply the patch
1. tail -f /var/log/koha/kohadev/zebra-output.log
2. Hit a bibliographic record detail page with several items
3. Notice that the log has 1 line per item:
11:30:36-14/06 zebrasrv(32) [warn] ir_session (exception)
4. Apply the patch
5. Hit the page again
6. There is nothing in the zebra log file
If you are familiar with analytic records, confirm that you are not
allowed to remove an item that is used in analytical biblio records.
Signed-off-by: Hugo Agud <hagud at orex.es>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit d421cfaed55df1404a9242cfbbf9ad95c0a2ccf5
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Mon Jun 18 09:04:19 2018 +0200
Bug 20953: Prevent several discharge requests on OPAC
On OPAC, a user can requested a discharge even if one is already pending.
This generates several pending discharges in staff interface that can not be deleted.
This is because request operation leads to page 'opac-discharge.pl?op=request' and user can refresh this page performing a new request.
Perl code must check that operation is allowed.
Patch reoganised the code so that the following FIXME is obsolete :
'FIXME looks like $available is not needed'
Patch also replaces 'op' arg test to also check undef : input->param("op") // ''
Test plan :
1) Set system preference 'useDischarge' to 'Allow'
2) Choose a patron without checkouts nor fines nor restrictions
3) Log at OPAC and go to patron page /cgi-bin/koha/opac-user.pl
4) Click on 'ask for a discharge' tab
=> You see /cgi-bin/koha/opac-discharge.pl
with text 'What is a discharge? ...'
5) Click on 'Ask for a discharge' link
=> You see /cgi-bin/koha/opac-discharge.pl?op=request
with text 'Your discharge request has been sent ...'
6) In a new browser tab/page, go to intranet on /cgi-bin/koha/members/discharges.pl
=> You see one discharge requets for the patron
7) Come back to OPAC and refresh page
=> You see /cgi-bin/koha/opac-discharge.pl
with text 'Your discharge will be available on this page within a few days.'
8) Come back to intranet and refresh /cgi-bin/koha/opac-discharge.pl
=> There is still one requets for the patron
9) Come back to OPAC and enter URL /cgi-bin/koha/opac-discharge.pl?op=get
=> You see /cgi-bin/koha/opac-discharge.pl
with text 'Your discharge will be available on this page within a few days.'
10) Come back to intranet and refresh /cgi-bin/koha/opac-discharge.pl
=> There is still one requets for the patron
11) Click on 'allow' on patron discharge request
12) Come back to OPAC and refresh /cgi-bin/koha/opac-discharge.pl
=> You see link 'Get your discharge'
13) enter URL /cgi-bin/koha/opac-discharge.pl?op=request
=> You see same page and no new discharge requets is created
14) Come back to intranet on patron details page
15) Remove the discharge restriction
16) Come back to OPAC and refresh /cgi-bin/koha/opac-discharge.pl
=> You see text 'What is a discharge?...'
17) enter URL /cgi-bin/koha/opac-discharge.pl?op=get
=> You see same page and no new discharge requets is created
Signed-off-by: Charles Farmer <charles.farmer at inLibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 1debd8bf81f2db8c5e222083ed5104539972db89
Author: Mirko Tietgen <mirko at abunchofthings.net>
Date: Fri Jun 15 12:34:51 2018 +0200
Bug 20949: (follow-up) debian/control
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 4b8bcd9be9e820f3d63d36f787eec30b439cb977
Author: Mirko Tietgen <mirko at abunchofthings.net>
Date: Fri Jun 15 12:10:19 2018 +0200
Bug 20949: Koha depends on Clone
Clone was not declared a dependency before. It used to be a dependency
of Hash::Merge but isn't in the recent version.
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit e41387016e3673c1358fd1c99efde28d03d1883c
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Mar 13 14:13:10 2017 +0100
Bug 18250: Force startup order in postinst script
This is a workaround meant to correct upgrading installs.
We force the order by disable/enable.
Test plan:
[1] When upgrading an existing install, check that the startup order
after the upgrade has been corrected in /etc/rcX.d (say X=5).
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7d6cdf9c2a6c7920769d7a8e8d4d355a8d393413
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Mar 13 13:53:49 2017 +0100
Bug 18250: Update LSB block of koha-common init script
Currently koha-common may start before memcached. We should prevent that.
If we add memcached to the LSB section of the koha-common init script,
Debian's insserv will know about this requirement.
Note: This patch is only a step in resolving the issue.
Test plan:
[1] Copy the updated koha-common script to /etc/init.d
[2] Look for S..koha-common and S..memcached in /etc/rcX.d (say X=5)
[3] Run sudo update-rc.d koha-common disable
[4] Run sudo update-rc.d koha-common enable
[5] Look again for S..koha-common in /etc/rcX.d (say X=5).
The number for koha-common should now be higher than for memcached.
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ea184236a493fdc1267253662838ed64f72139ef
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Mon Jun 25 14:14:43 2018 +0200
Bug 19502: Add POD for max_result_window
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Alex Arnaud <alex.arnaud at biblibre.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit d38a0404811427e333014ebae9e9df83736dc540
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Mon Jun 25 14:14:32 2018 +0200
Bug 19502: Remove debug warn
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Alex Arnaud <alex.arnaud at biblibre.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 95b1983a25dcca14700e7251f94fde43f78f6911
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Tue Jun 5 15:11:34 2018 +0200
Bug 19502: Retrieve index.max_result_window from ES
This avoid hardcoding '10000' in two different places and allow users to
adjust this setting.
Also, this patch fixes a bug when the search return less than 10000
results
Test plan:
1. Do a search that returns 10000+ records.
2. Note the warning above the pagination buttons
3. Go to the last page, no error
4. Change the ES setting:
curl -XPUT http://elasticsearch/koha_master_biblios/_settings -d \
'{"index": {"max_result_window": 20000}}'
5. Do another search that returns more than 10000 but less than 20000
6. Note that the warning does not show up
7. Go to the last page, still no error
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Alex Arnaud <alex.arnaud at biblibre.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 78b9a3e4509b3b8dcc4d76cffd3ed3f7f4952543
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Apr 19 23:13:49 2018 +0000
Bug 19502: (follow-up) Pass parameters to avoid making templates depend on search engine
https://bugs.koha-community.org/show_bug.cgi?id=19502
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Alex Arnaud <alex.arnaud at biblibre.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit cc131475eda2871afa2e5a4cf8f6f7191af06b31
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Mar 16 11:10:37 2018 +0000
Bug 19502: Limit pagination to first 10000 results when using ES
This patch is to avoid hitting an error page. We should eventually make the
max number returned configurable for ES.
To test:
1 - Have Koha running ES with 10,000+ records
2 - Search for '*'
3 - Click 'Last' to view last page of results
4 - 'Cannot perform search' error
5 - Apply patch
6 - Search again
7 - View 'Last' page
8 - No error, you go to the last of 10000
9 - Note the warning above the pagination buttons
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Alex Arnaud <alex.arnaud at biblibre.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 2414a4e7056656843696aca19a75acebb577745a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jun 29 14:09:07 2018 -0300
Bug 21009: Fix max length of inputs on editing/adding items
There is a "max length" value you can define at framework level to
limit the size of the input. But it is not taken into account on the
add/edit item form.
It is a regression that has been introduced by
commit 47d2de9c024bfb93d56184f298f334b20685cd86
Bug 12176: Remove HTML from additem.pl
max_length vs maxlength
Test plan:
- Define a maximum length for an item subfield
- Add or edit an item
=> Without this patch the maxlength attribute of the inputs are not
defined (maxlength="")
=> With this fix you will see the maxlength attributes correctly set
with the value you defined in the framework
Note:
We could/should set this value to the size of the DB column when mapped
For instance 952$u is mapped with items.uri, which is a varchar(255).
This length restriction should done at framework level
Signed-off-by: Pierre-Luc Lapointe <pierreluc.lapointe at inLibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 82e0e97a0081ce75c334ca3073d385e53f21d51c
Author: Victor Grousset <victor.grousset at biblibre.com>
Date: Thu Jan 25 14:37:56 2018 +0100
Bug 20084: Fix Industrial2of5 and COOP2of5 patron card layouts
== Test plan ==
This is an oversimplification of a full patron card setup used in production.
1. Create a batch with 1 patron
2. Create a layout and set
the name
"Print card number as barcode"
"Barcode type:" to "Code 39"
3. Create a card template without filling anything
4. Export the batch using the layout and template
5. You should have a white page with a barcode
And no errors in the relevant log file
This show that this setup isn't completely bogus
(although Code 39 is the only type working...)
6. Layout: set "Barcode type:" to Industrial2of5
7. Export the batch
8. You should have a white page with no barcode
And errors in the relevant log file
"Invalid Characters"
This is the bug.
9. Layout: set "Barcode type:" to COOP2of5
10. Export the batch
11. You should have a white page with no barcode
And errors in the relevant log file
"Invalid Characters"
This is the bug.
12. Apply this patch
13. Retry with both non-working patches
1. You should have a white page with a barcode
2. And no errors in the relevant log file
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 27de9a3e5d2ea7b803852649836b9442b10896f7
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Jul 9 13:24:44 2018 +0000
Bug 21054: Remove extraneous </body> tag from sco-main.tt
To test:
1 - Enable sco and setup AutoSelfCheck
2 - Try to use self checkout and print receipt
3 - You shoudl be redirected to the login page
4 - Apply patch and restart all the things
5 - Try to use self checkout and print a receipt
6 - Success!
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit bcba640f115e07480c502c2bf8522acdb9d8d5df
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jun 21 18:06:00 2018 -0300
Bug 20979: Fix confirm deletion popup when deleting a biblio
When deleting an empty bib, error messages pops up "1 order(s) are
using this record. You need order managing permissions to delete this
record." even though user has superlibrarian permissions. Prevents the
deletion of the bib record.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit a6b8fc9b2e29b91cef62def4f8b4fed98efa9aea
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Fri Jul 6 13:40:53 2018 +0000
Bug 21046: Return the correct borrowernumber when there is empty cardnumber(s)
Test plan:
- Use a patron with an empty cardnumber to authenticate with ILSDI
AuthenticatePatron
(cgi-bin/koha/ilsdi.pl?service=AuthenticatePatron&username=userid&password=pass),
- make sure you have other patron(s) with empty cardnumber and there
borrowernumber is
smaller than the one you authenticate with,
- you should get a wrong borrowernumber,
- apply this patch,
- test again, you should get the right one
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/ILSDI/Services.pm | 2 +-
C4/Installer/PerlDependencies.pm | 5 ++
C4/Patroncards/Patroncard.pm | 4 +-
Koha/Account.pm | 19 +++++++
Koha/SearchEngine/Elasticsearch/Search.pm | 28 +++++++++++
Koha/SearchEngine/Zebra/Search.pm | 10 ++++
catalogue/detail.pl | 14 ++++--
catalogue/search.pl | 5 +-
cataloguing/additem.pl | 14 +++---
debian/control | 2 +
debian/koha-common.init | 2 +-
debian/koha-common.postinst | 6 +++
.../prog/en/includes/page-numbers.inc | 1 +
.../prog/en/modules/catalogue/results.tt | 1 -
.../intranet-tmpl/prog/en/modules/labels/result.tt | 53 +++++++++-----------
koha-tmpl/intranet-tmpl/prog/js/catalog.js | 6 +--
.../bootstrap/en/includes/page-numbers.inc | 1 +
.../bootstrap/en/includes/search/page-numbers.inc | 1 +
.../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 1 -
opac/opac-discharge.pl | 31 +++++++-----
opac/opac-search.pl | 5 +-
t/db_dependent/ILSDI_Services.t | 8 +++
t/db_dependent/Koha/Account.t | 36 ++++++++++++-
.../Koha_SearchEngine_Elasticsearch_Search.t | 15 +++++-
24 files changed, 201 insertions(+), 69 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list