[koha-commits] main Koha release repository branch master updated. v3.18.00-624-g27dda97
Git repo owner
gitmaster at git.koha-community.org
Fri Apr 10 17:31:36 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, master has been updated
via 27dda9782c26ed44926c7dbce1e4926711e0378b (commit)
via cc119bd856eb557bfc0107919a1ac06a669b944b (commit)
via 03382a089df2e48799c0dcaa0b3cecebef6c1ddf (commit)
via 4094a235def0fb268720f3d3b4ae6d9ea1e9ddfc (commit)
via eab9af7ee7344c4fd5a09202cb8b9415d0e7f9e5 (commit)
via 68e4f96511b070eb9f9ccfd5e31c6f51a70943fd (commit)
via 7c2fad1bafc38d7ed70e9508293136d89d77879c (commit)
from 4f60138080cba847a53b7373c0c98ec42766b8df (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 27dda9782c26ed44926c7dbce1e4926711e0378b
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Mar 18 13:09:06 2015 +0100
Bug 13866: Columns configuration - Patrons search
This patch adds the ability to hide columns on the patrons search page
(acqui/lateorders.pl).
Test plan:
Go on the patrons search page and confirm you are able to hide columns.
You can also play with the columns configuration admin page and confirm
that the behaviors are consistent.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Works as expected
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Small rebase was needed.
commit cc119bd856eb557bfc0107919a1ac06a669b944b
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon Dec 15 11:16:50 2014 +0100
Bug 13372: Sort is done by DataTables
This patch removes the order by filter on the items lost report.
The sort can now be done by DataTables.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 03382a089df2e48799c0dcaa0b3cecebef6c1ddf
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Dec 2 13:33:11 2014 +0100
Bug 13372: Items lost report improvements
This enhancement adds new column to display the call number on the
items lost report.
On the way, DataTables and ColVis are added on the table.
Test plan:
1/ Go on the items lost report (reports/itemslost.pl) and verify that the
call number column is correctly filled.
2/ On the way, verify that the 'Library' and 'Current location' now contain
the name instead of the code.
3/ Go on the columns configuration in the admin module
(admin/columns_settings.pl), play with the ColVis plugin and confirm
that all works correctly.
Signed-off-by: David Roberts <david.roberts at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 4094a235def0fb268720f3d3b4ae6d9ea1e9ddfc
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>
commit eab9af7ee7344c4fd5a09202cb8b9415d0e7f9e5
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Apr 1 12:03:13 2015 +0200
Bug 13936: Last patch contained wrong change
One of the 2 changes done in the last patch was not for this bug report.
The tt change was intended for bug 13926.
This patch reverts it.
BE CARE: This should NOT be pushed AFTER bug 13926!
Test plan:
Search for a patron using the 'check out' tab in the circulation module.
Signed-off-by: Nicolas Legrand <nicolas.legrand at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
- use the checkout tab to search for a patron
not using the autocomplete, but hitting enter
- without the patch, there won't be results
- with the patch there are
Passes all tests and QA script.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 68e4f96511b070eb9f9ccfd5e31c6f51a70943fd
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>
commit 7c2fad1bafc38d7ed70e9508293136d89d77879c
Author: Jacek Ablewicz <abl at biblos.pk.edu.pl>
Date: Mon Mar 23 15:21:53 2015 +0100
Bug 10906 - Reimported records into Koha are imported only as DEFAULT frameworks, not what they were originally
Existing framework code is currently not retained when local record
gets replaced during batch import, or when the restore/reverse function
is being used.
This patch fixes aforementioned issues by correcting outdated GetBiblio()
calls in C4/ImportBatch.pm
To test:
1/ try to replicate the issue: import some MARC records with
"Tools -> Stage MARC records for import" etc., using test setup,
matching rules and so on such that some existing records will get
replaced with imported ones
2/ observe that records replaced during import now open in the editor
with 'Default' framework, even if they have some other framework
set up previously
3/ apply patch
4/ redo 1/, confirming that this problem is no longer replicable
5/ try use 'restore' function with some freshly imported
records, ensure that original framework code got retained
in the records which had their imports reverted
NOTE: I confirmed this change by
1) git grep "=\s*GetBiblio\s*("
-- this shows how GetBiblio is called elsewhere.
It differed! So then...
2) vi C4/Biblio.pm
/sub GetBiblio
-- find the right one, notice it only returns a HASH ref,
not an array.
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>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 10 +-
C4/ImportBatch.pm | 4 +-
C4/ItemType.pm | 3 +
C4/Items.pm | 15 +--
C4/Overdues.pm | 10 +-
admin/columns_settings.yml | 60 ++++++++++
.../prog/en/modules/admin/columns_settings.tt | 13 ++
.../prog/en/modules/circ/circulation.tt | 2 +-
.../prog/en/modules/members/member.tt | 7 +-
.../prog/en/modules/reports/itemslost.tt | 124 +++++++++++---------
reports/itemslost.pl | 5 +-
t/ItemType.t | 8 +-
12 files changed, 173 insertions(+), 88 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list