[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.05.1-79-ga21185e
Git repo owner
gitmaster at git.koha-community.org
Mon Apr 20 12:19:15 CEST 2015
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, 3.18.x has been updated
via a21185e978dbcec39128c191f484e0f5b0477c9d (commit)
via 32d0752bb4a512f2c3a716a8a1df4efb4319b636 (commit)
via 4a6473be955bff9e623a6c2b7eeceeccd2bc6a88 (commit)
via 463e17f71480d5580e7c3e4abe44a380e9bb3483 (commit)
via ef5c2cda9a60b362a9139be9c4298369e4f687f4 (commit)
from afc3aa4007d7051028dba95d5462b886ba91644c (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 a21185e978dbcec39128c191f484e0f5b0477c9d
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Sat Oct 11 16:53:41 2014 +0200
Bug 13069 - (follow-up) Enable sort by title to ignore articles
This should affect the relatives' checkouts table too.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
NOTE: This is the one later in the javascript file.
Checkout tab on the patron details page.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 18c6b4e237032126d767ad98a66b6d80db2d8270)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit 32d0752bb4a512f2c3a716a8a1df4efb4319b636
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Oct 9 15:22:29 2014 +0000
Bug 13069 - Enable sort by title to ignore articles on circulation and patron detail pages
With the conversion of the circulation and patron detail checkout
summary tables to AJAX recently we lost the ability to sort by title
while ignoring articles.
This patch corrects the problem by adding the "anti-the" configuration
to the relevant column in the DataTables initializtion script.
To test, apply the patch and clear your cache if necessary. Check out to
a patron who has multiple checkouts, some of which have titles beginning
with "a," "an," and "the." Sorting those checkouts by title should
ignore articles.
Test the patron detail page for that patron as well.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
NOTE: This is the one early in the javascript file.
This is the one visible by having multiple checkouts
where the title excluding the articles is a different
order than titles including the articles.
Patrons -> Details (scroll down to check out area, view
checkouts and toggle the title sort)
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 9b44647509e4d08029760bae25703b049a4bda30)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit 4a6473be955bff9e623a6c2b7eeceeccd2bc6a88
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Sun Apr 12 10:54:50 2015 -0300
Bug 13909: (QA followup) fix references to get_chargeable_units
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 653686cee9cd3032642933427d86ec9331612607)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit 463e17f71480d5580e7c3e4abe44a380e9bb3483
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Fri Mar 27 14:32:35 2015 -0300
Bug 13909: Suspension days calculation should respect finesCalendar
This patch make _debar_user_on_return respect the finesCalendar syspref.
It does so, by replacing the ad-hoc overdue days calculation in favor of
C4::Overdues::_get_chargeable_units (which is renamed C4::Overdues::get_chargeable_units
and exported). There's no behaviour change besides making the calculation simpler
and correct.
To test:
- Set finesCalendar = "directly"
- Have a circulation rule stating:
interval for calculating fines = 1
suspension days = 3
- Have the calendar set for sunday and saturday as holidays.
- Checkout an item with a branch/itype/borrower category that matches the defined circ rule with a hand-writen due date to (say) last friday.
- Check the item in
=> FAIL: Notice that the user is debarred using the calendar (skipping saturday and sunday).
- Apply the patch
- Repeat the previous steps
=> SUCCESS: calculation is correct (counting saturday and sunday as overdue days, i.e. 'directly').
- Set finesCalendar = "calendar"
- Repeat the test
=> SUCCESS: calculation is correct (skipping holidays).
- Sign off.
Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 4094a235def0fb268720f3d3b4ae6d9ea1e9ddfc)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit ef5c2cda9a60b362a9139be9c4298369e4f687f4
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Apr 1 10:12:05 2015 +0200
Bug 13934: C4::ItemType->get should return undef if no parameter given
The issue: If you try to check in an item with a non existent barcode,
the application will exploded with a software error:
"Can't bless non-reference at .../ItemType.pm Line 64".
It's caused by:
commit 7431f8cfe29e330e2232b0df591afc4d923b0a52
Bug 11944: Fix encoding issue in C4::ItemType
and the following change:
@@ -105,9 +104,6 @@ sub get {
my $data = $dbh->selectrow_hashref(
"SELECT * FROM itemtypes WHERE itemtype = ?", undef, $itemtype
);
- if ( $data->{description} ) {
- $data->{description} = Encode::encode('UTF-8', $data->{description});
- }
because of the following:
my $s;
$s->{foo} = "bar" if $s->{foo};
use Data::Dumper;warn Dumper $s;
=> {} # not undef
So later,
bless $opts => $class;
will fail because $opts is undef and was not (i.e. {}) before.
More explicit test plan:
1) Log in to staff client
2) Circulation -> Check in
3) Type a non-existent barcode into 'Enter item barcode:' textbox
4) Click 'Submit'
-- Should receive nasty error.
5) apply patch
6) repeat steps 2-4
-- Should be told 'No item with barcode: {what you typed}'
7) prove -v t/ItemType.t
-- All tests should run successfully.
7) run koha qa test tools
Note: Having tried to create and use an itemtype '0', this only
demonstrates a lack of validation on the itemtype creation
screen. Unable to use it without tweaking back end.
That is beyond the scope of this bug.
Note for QA: C4::ItemType->get is only uses in circ/return.pl. So even
if the behavior is changed, it should not introduce any regression
somewhere else.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Works as expected. Fixes the problem and no regressions found.
It even has regression tests :-D
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 68e4f96511b070eb9f9ccfd5e31c6f51a70943fd)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 10 +++++-----
C4/ItemType.pm | 3 +++
C4/Overdues.pm | 10 +++++-----
koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js | 6 ++++--
t/ItemType.t | 8 +++++---
t/db_dependent/Circulation.t | 2 +-
6 files changed, 23 insertions(+), 16 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list