[koha-commits] main Koha release repository branch 16.11.x updated. v16.11.06-44-g5a5af02
Git repo owner
gitmaster at git.koha-community.org
Sun Apr 16 15:24:15 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, 16.11.x has been updated
via 5a5af02be9eda69c77146184fe8392ca9c4067f3 (commit)
via 8c17314ef80cc54180446f7c3e85dbcf7125aebd (commit)
via 0aff3c0231485e95dfe95556149d569b3818a674 (commit)
via 3079f7a72515a22062bd9a65ec546cfcd6d9bb66 (commit)
via 733d77520f92f9367fa0a100cdcda79d2a98232d (commit)
via 061baca0884e27533ba8c37fb139644727fda7f5 (commit)
via 042409941691b06db7e755247040781f867c0356 (commit)
via fee024e18a0775c937671ca9c90e12a1992f1995 (commit)
via 9062df67c8df0e6416ee69c01bf10e0acf111bf7 (commit)
via 3ef6f12596d75ec2548e9081e89694df3536bb7e (commit)
via dbee200409d738fcf7c4fdcfb2cd19f5d6d36c04 (commit)
via 0a26e824ae3861fefb8a615c7e042fbfc83698f4 (commit)
from dbd6ec62a40d4cb52da8911174f158288b498886 (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 5a5af02be9eda69c77146184fe8392ca9c4067f3
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Wed Dec 28 15:08:42 2016 +0100
Bug 17821 - due date in intranet search results should use TT date plugin
Intranet search results displays due date from item onloan.
This should use the TT date plugin.
Test plan :
- set syspref dateformat not on yyyy-mm-dd, for example dd/mm/yyyy
- checkout an item
- at intranet, perform a search where you see the item
=> You must see : "date due : dd/mm/yyyy"
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 7df47b48ba8a7241f062d14fb9f32770b80694d9)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 8c17314ef80cc54180446f7c3e85dbcf7125aebd
Author: Alex Buckley <alexbuckley at catalyst.net.nz>
Date: Sat Apr 8 23:18:23 2017 +0000
Bug 12930: Web installer does not show login errors
Implemented invalid_username_or_password template
variable being handed to Auth.tt. Removed indentation
changes and modification to return value of checkpw
Test plan:
See comment #2
Alternative test plan:
- Clear session cookies or close / open your browser
- Go to [MY SERVER]/cgi-bin/koha/installer/install.pl
- Verify that message appears if wrong username/pw provided
- Verify that you can log in with databas administrator account
Tested with alternative test plan, works as expected. Title and
description in commit message adapted.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 87eb80136d49451d0a9cc25e68db452a33f1771a)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 0aff3c0231485e95dfe95556149d569b3818a674
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Apr 3 12:50:27 2017 -0300
Bug 18373: Re-add UpgradeBackup.pm
Bug 18028 removed the install_misc directory but
install_misc/UpgradeBackup.pm was still used by the 'upgrade' rule of
make.
Other files from install_misc were useless to it may be better not to
reintroduce this directory with only 1 file.
Test plan:
`make`
`sudo make install`
`make upgrade`
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 508147d24443498a2c12a7c55240e70941c49dd6)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 3079f7a72515a22062bd9a65ec546cfcd6d9bb66
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Tue Jan 10 10:03:36 2017 +0100
Bug 17872: Fix small error in GetBudgetHierarchy and one of its calls
In aqbudgetperiods.pl a commented line is removed that contains a
wrong userenv hash key. Should be branch instead of branchcode.
In aqbudgets GetBudgetHierarchy is called with the same wrong userenv
hash key. Should be userenv->{branch}.
This made another bug visible: if you call GetBudgetHierarchy with a
branch and without owner, the where clause should take into account
that the branchcode can be empty (not null).
Test plan:
[1] Run Budgets.t
[2] Run aqbudgets.pl from Administration
[3] Add the show_mine=1 parameter in the URL
[4] Change owner of one of the funds and repeat step 2 and 3.
t/Budgets.t returns green. Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 476179a12311b32643087cc8ec10c31409bb1b99)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 733d77520f92f9367fa0a100cdcda79d2a98232d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Apr 11 10:31:49 2017 -0300
Bug 14932: Do not call can_edit_subscription with an empty value
ref($sub) eq 'ARRAY' should always be true, what we want is to call
can_edit_subscription if there is at least 1 serial for this
subscription.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 17f4b05d23cb19cebeedb361005bf411a5f25c60)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 061baca0884e27533ba8c37fb139644727fda7f5
Author: Olli-Antti Kivilahti <olli-antti.kivilahti at jns.fi>
Date: Thu Oct 1 15:23:23 2015 +0300
Bug 14932 - serials/serials-collection.pl-page is very slow. GetFullSubscription* checks permission for each serial!
Currently we have subscriptions with 300+ serials received.
It takes a lot of time to show serials-collection.pl (~20s).
This is especially troublesome when receiving serials, since after receival we get redirected to that page.
We no longer can receive daily serials in the allotted timeframe.
This quick and dirty fix prevents checking the subscription editing for each serial, but instead checks it for the first serial only.
This reduced page load time by ~18s
TEST PLAN:
1. Receive ~300 serials (or just a bunch :) )
2. Observe the gradual slowing of the receival action.
AFTER THIS PATCH:
1. Receive ~300 serials more (or just a bunch)
2. Observe a significant performance improvement.
Signed-off-by: Paul POULAIN <paul.poulain at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 6940aa91a53371ba49528022954a9a349044ab63)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 042409941691b06db7e755247040781f867c0356
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Apr 7 10:13:00 2017 +0200
Bug 18349: [QA Follow-up] Add four missing error messages
The error codes come from CanBookBeIssued.
The warnings speak for themselves. Note that the GNA message is similar
to the one used in opac-user.tt (gonenoaddress is translated to the patron
as contact information not up-to-date).
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 392641ff1ec0cf2b6480af134fd676edf64f4df7)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit fee024e18a0775c937671ca9c90e12a1992f1995
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Mar 31 13:25:13 2017 -0300
Bug 18349: Remove useless info in alert message
Empty tags should be removed, and message id
Note that not all error codes are covered here.
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit b61f73c48832e0f10ca799aa49682da37f1f44a1)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 9062df67c8df0e6416ee69c01bf10e0acf111bf7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Mar 31 13:22:05 2017 -0300
Bug 18349: If a confirmation is required, consider as blocker
Only RENEW_ISSUE should not be considered as blocker, others should.
Note that this code is not robust and the whole script as well as the
return of CanBookBeIssued should be rewrittent completely.
We need a small patch to easy backport to stable releases
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit d28d5a280d590bb19afbea23705802aa46af5e6d)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 3ef6f12596d75ec2548e9081e89694df3536bb7e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Mar 30 21:51:28 2017 -0300
Bug 18349: $borrower is a hashref
I guess this code was never called before...
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 6b75e5b4783cff1d14816ce363e8095569d67718)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit dbee200409d738fcf7c4fdcfb2cd19f5d6d36c04
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Mar 29 18:25:40 2017 -0300
Bug 18349: SCO - Do not trust the confirmed flag
The "confirmed" flag is used to know if that user confirmed a situation
that needs a confirmation.
But if the issue/renew is impossible the CanBookBeIssued and the
'impossible flags' should be checked.
Otherwise a patron can checkout and renew bypassing the circulation
rules (Understand 'no limit' here...)
Test plan:
Want to renew?
Checkin $barcode, then
/cgi-bin/koha/sco/sco-main.pl?patronid=$cardnumber&barcode=$barcode&confirmed=1&op=checkout
Want to bypass the checkin?
Same url...
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 85bd15a83ffdab0c2e28eae54e50ce4dee9e608b)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 0a26e824ae3861fefb8a615c7e042fbfc83698f4
Author: David Kuhn <techservspec at gmail.com>
Date: Wed Dec 14 16:02:26 2016 -0800
Bug 17309 - Renewing and HomeOrHoldingBranch syspref
The AddRenewal subroutine currently uses the circulation rules for the branch
stored in the Issues table (which is the holding branch) when calculating the new due date.
This patch replaces using the branch from the Issues table with the branch
specified by the HomeOrHoldingBranch syspref.
To test:
1. Set up 2 branches, Branch1 and Branch2
2. Set up a loan rule in Branch1 for DVDs with a 21 day loan period and a
21 day renewal period.
3. Set up a loan rule in Branch2 for DVDs with a 14 day loan period and a
14 day renewal period.
4. Checkout a DVD belonging to Branch1 while logged into Branch2. It will
receive the correct 21 day loan period.
5. Renewing the same DVD while logged into either Branch1 or Branch2
will give a 14 day due date, rather than 21 days.
6. Checkout a DVD belonging to Branch2 while logged into Branch1. It will
receive the correct 14 day loan period.
7. Renewing the same DVD while logged into either Branch1 or Branch2
will give a 21 day due date, rather than 14 days.
8. Apply the patch and repeat steps 4-7. The correct due date should be given
when the item is renewed, regardless of where it is checked out or renewed.
This update removes reassignment of $branch variable.
Signed-off-by: Cédric Vita <cedric.vita at dracenie.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 7d35bdf58a0bcebab20df47b50b249cafe12ddb6)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
-----------------------------------------------------------------------
Summary of changes:
C4/Budgets.pm | 2 +-
C4/Circulation.pm | 2 +-
C4/InstallAuth.pm | 4 +
C4/Installer/UpgradeBackup.pm | 94 ++++++++++++++++++++
C4/Search.pm | 2 +-
C4/Serials.pm | 6 +-
Makefile.PL | 2 +-
admin/aqbudgetperiods.pl | 2 -
admin/aqbudgets.pl | 3 +-
.../prog/en/modules/catalogue/results.tt | 3 +-
.../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 32 +++----
opac/sco/sco-main.pl | 35 ++++----
12 files changed, 144 insertions(+), 43 deletions(-)
create mode 100644 C4/Installer/UpgradeBackup.pm
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list