[koha-commits] main Koha release repository branch master updated. v3.20.00-517-gf189696
Git repo owner
gitmaster at git.koha-community.org
Mon Sep 7 16:16:04 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 f189696bb7bfeeb82e977d3b9a8eff6f24555b55 (commit)
via 0f74321977c50ef45daa4897933ee0fac378dcb6 (commit)
via f37d9d005c965d5218b9133873616807296b2dbd (commit)
via 8c132e956e6141b42d09e7544687fd35632ca3c6 (commit)
via 64992a05ce87af7bf595c8d6f0b9d528887a2e44 (commit)
via abd71d017ea68f4209e41b34282e8fce8170e175 (commit)
via 503dd6036974b4208bd5cd60a87bb28599987f45 (commit)
via cbdd49ed7003f124d55f399e5d2709ef81fb7243 (commit)
via efe3d17acc237e00cc7c0e37eba92e8eead57ebf (commit)
via db891d33f0bbe75748fd725036066f45c2e762fe (commit)
via 69994c38a00a1199b814d823c4e20503d86b28bf (commit)
via 7bad40dcc294d6d56c937cbd81267fc9df73b6aa (commit)
via d8a9d171154f3ad526f31968fdec1ad7809014b8 (commit)
via 5b521eb394771ee305777f0b44098be5fdd11cc7 (commit)
via bb4b7f46d13a75401af8c70fd39b9fcbbb9bbc1d (commit)
via bcab2416399e93f5ce9b1083395c052046d5d02a (commit)
via 198e273530210f2f2df9ab8401cf7d4ee31cba89 (commit)
via 1accce387030db73cbd2e9496ab642b351f8551b (commit)
via ea6c4f5b8aab8f9bcb4ff0a32349f32016879230 (commit)
from c4a4581a50681a35cedda43758a49a8b567c40a9 (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 f189696bb7bfeeb82e977d3b9a8eff6f24555b55
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date: Wed May 27 14:02:25 2015 +0200
Bug 14098: Implement the copy_and_replace action for MTT
This patch implements the copy and replace action for the marc
modification templates.
Instead of copying a field/subfield, it will erase the destination
fields/subfields.
Test plan:
Find it yourself.
Compare the differences between the copy and the copy_and_replace
actions.
The easier way to test is to 1/ create a complete record, 2/create some
modification templates and 3/ use the batch record modification with the
"preview" function.
QA note: I kept the same tests as "copy" and, if no change were
expected, I noted them "(same as copy)", to be sure this new action won't
introduce regression on these tests.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 0f74321977c50ef45daa4897933ee0fac378dcb6
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date: Wed May 27 13:38:38 2015 +0200
Bug 14098: Add copy_and_replace action to MMT
This patch add the new value for the MTT action.
It updates the marc_modification_template_actions.action DB field to
allow 'copy_and_replace_field'.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit f37d9d005c965d5218b9133873616807296b2dbd
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date: Wed May 27 13:34:09 2015 +0200
Bug 14098: Remove unedeed subroutines
Just some cleaning before to continue, _copy_field and _copy_subfield did not
do anything useful.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 8c132e956e6141b42d09e7544687fd35632ca3c6
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date: Wed May 27 12:51:37 2015 +0200
Bug 14098: FIX Copy a subfield should not update the original field
There is an inconsistency in the copy action:
Given the following control sample:
245 _aThe art of computer programming
_cDonald E. Knuth.
300 _aA_exists
_bB_exists
If we apply action (a) Copy the whole field 245 to 300, we get:
245 _aThe art of computer programming
_cDonald E. Knuth.
300 _aA_exists
_bB_exists
300 _aThe art of computer programming
_cDonald E. Knuth.
If we apply action (b) Copy the subfield 245$a to 300$a, we get:
245 _aThe art of computer programming
_cDonald E. Knuth.
300 _aThe art of computer programming
_bB_exists
In (a) the field is copied but in (b) the subfield is erased.
We should be consistent and don't erase the destination field.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 64992a05ce87af7bf595c8d6f0b9d528887a2e44
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Tue Aug 25 11:33:04 2015 +0200
Bug 14721: OAI-PMH must return error when no results
When getting records from OAI-PMH, an error must be returned if there is no results.
See : http://www.openarchives.org/OAI/openarchivesprotocol.html#ErrorConditions
Test plan :
- Enable OAI webservice
- Perform a query that will return no results. ie : /cgi-bin/koha/oai.pl?verb=ListRecords&metadataPrefix=marcxml&from=2099-12-30&until=2099-12-31
=> Without patch you get a response with :
<ListRecords/>
=> With patch you get a response with error code :
<error code="noRecordsMatch">No records match the given criteria</error>
- Check a good query returns still results
- Same test with ListIdentifiers verb
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit abd71d017ea68f4209e41b34282e8fce8170e175
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Fri Sep 4 08:57:08 2015 +0200
Bug 14766: unimarc_field_4XX: escape ', ", \n, \r
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 503dd6036974b4208bd5cd60a87bb28599987f45
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Wed Aug 26 10:54:30 2015 +0200
Bug 14766: Complete cataloguing plugin unimarc_field_4XX
Add subfields l, n and o for better UNIMARC compliance
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Note: I just did a code audit here, as I don't know enough about
UNIMARC to know if the 4XX fields should have these subfields.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit cbdd49ed7003f124d55f399e5d2709ef81fb7243
Author: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
Date: Tue Aug 18 16:37:27 2015 -0300
Bug 14651: Koha::Item->effective_itemtype fallback to bib-level
In some situations (bad migrations, old bugs that introduced bad data,
people having bib-level itypes for ages and switching to item level...)
the user ends with undex itype values for items.
The current code, if the user has item_level-itype set, just returns
undef. It should fallback to bib-level. In order to avoid hiding the problem
a warning is raised.
To test:
- Run the regression tets:
$ prove t/db_dependent/Items.t
=> FAIL: tests fail.
- Apply the patch
- Run the tests again
=> SUCCESS: The tests now pass.
- Sign off :-D
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit efe3d17acc237e00cc7c0e37eba92e8eead57ebf
Author: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
Date: Tue Aug 18 16:34:25 2015 -0300
Bug 14651: (regression test) fallback to bib-level if itype is undef
Koha::Item->effective_itemtype should fallback to biblio-level itemtype
even if item-level item types are set, in the case the item has no itemtype
set (bad migration, bad old code).
To test:
- Run
$ prove t/db_dependent/Items.t
=> FAIL: Koha::Item->effective_itemtype doesn't work properly
Edit: Added a test for a warning when falling back as per QA request
and because it made a lot of sense :-D
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit db891d33f0bbe75748fd725036066f45c2e762fe
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Sep 7 11:12:49 2015 -0300
Bug 14717: DBRev 3.21.00.023
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 69994c38a00a1199b814d823c4e20503d86b28bf
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Sep 3 16:07:42 2015 +0100
Bug 14171: Update borrowers date fields
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
http://bugs.koha-community.org/show_bug.cgi?id=14717
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 7bad40dcc294d6d56c937cbd81267fc9df73b6aa
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Sep 3 16:03:17 2015 +0100
Bug 14717: Prevent 0000-00-00 on updating a patron
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit d8a9d171154f3ad526f31968fdec1ad7809014b8
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Tue Aug 25 10:00:20 2015 +1200
Bug 14717: Invalid dates in debarred column
To test
1/ Import a patron using the patron import tool, make sure they have
no debarred column in the file
2/ Check the database, notice the debarred column is 0000-00-00
3/ For bonus points, checkout an item to that borrower, then check it in
notice Koha errors
4/ Apply patch
5/ Import a new patron
6/ Notice column is now NULL and that checkins work
Signed-off-by: Eugene Espinoza <eugenegf at yahoo.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 5b521eb394771ee305777f0b44098be5fdd11cc7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jul 14 13:12:46 2015 +0100
Bug 11273: FIX barcode generation in acquisition if hbyymmincr
When AutoBarcode is activated and you have set AcqCreateItem to 'on
order' there is a Javascript error when you try to generate a barcode
for the item:
TypeError: document.f is undefined
http://localhost:8080/intranet-tmpl/lib/jquery/jquery.js
Line 11
Test plan:
0/ a. Set AutoBarcode to hbyymmincr
b. Set AcqCreateItem to 'on ordering'
c. Set the plugin barcode.pl to the barcode field for the default
and the ACQ frameworks
1/ Go on the add items page (cataloguing/additem.pl) and confirm that
the plugin works as expected.
2/ Go on the New order page (acqui/neworderempty.pl) and confirm that
the plugin works as expected.
Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit bb4b7f46d13a75401af8c70fd39b9fcbbb9bbc1d
Author: Julian FIOL <julian.fiol at biblibre.com>
Date: Wed Jul 15 16:10:17 2015 +0200
Bug 13585: Add a cronjob which send UsageStats monthly.
This patch introduces entries for monthly running the share_usage_with_koha_community.pl
script to the packages and also the crontab.example file for manual
installs use.
Edit: I fixed the Copyright line
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit bcab2416399e93f5ce9b1083395c052046d5d02a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jul 14 18:07:37 2015 +0100
Bug 14354: Prevent edition of items from other branches if IndependentBranches is on
If IdependentBranches is ON, to edit/delete items from other branches
you need to be superlibrarian.
Currently a "simple" staff user cannot edit them from the edit item page
but from the catalogue detail page.
The edit links should not be displayed on this table.
Test plan:
O/ Set IndependentBranches to "Prevent".
Create a record and add 2 items:
Set homebranch to L1 for item I1.
Set homebranch to L2 for item I2.
1/ With a superlibrarian user, you should be able to edit both items.
2/ With a "simple" user attached to L1, you should only be able to edit
I1. The edit links should not be displayed for I2.
Note that the checkbox is displayed on the catalogue detail page (item
list), but on the batch tools, it won't be possible to select non-modifiable
items.
TODO: Add a server-side check. Indeed it is still possible to edit an
item if the user know the url.
Followed test plan. Works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 198e273530210f2f2df9ab8401cf7d4ee31cba89
Author: Joonas Kylmälä <j.kylmala at gmail.com>
Date: Mon Aug 31 05:06:16 2015 +0000
Bug 14526: (follow-up) add a space before equals sign
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 1accce387030db73cbd2e9496ab642b351f8551b
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Jul 15 14:17:11 2015 +0200
Bug 14526: Add some unit tests for MoveReserve
The change in MoveReserve from the previous patch begs for a test.
Here we add some to Reserves.t.
In all six tests we place a hold, move it and check the reserves again.
Depending on the status of ConfirmFutureHolds, and the reservedate the
hold should be moved or not.
Test plan:
Run the unit test.
Bonus: If you run Reserves.t by applying this patch but without the first
patch that changed MoveReserve, tests 60 and 61 should fail:
not ok 60 - MoveReserve filled future hold now
not ok 61 - MoveReserve filled future waiting hold now
This may further illustrate the need of the first patch.
Signed-off-by: Joonas Kylmälä <j.kylmala at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit ea6c4f5b8aab8f9bcb4ff0a32349f32016879230
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Jul 13 21:55:55 2015 +0200
Bug 14526: MoveReserve should look at future holds too
At checkout a hold for the same borrower is considered to be filled.
It is consistent to do the same for holds of the same borrower within
[ConfirmFutureHolds] days (if non-zero).
This goal is achieved by adjusting the CheckReserves call within
MoveReserve, adding the lookahead parameter.
I used this occasion to revisit other calls of CheckReserves:
- transferbook: no need to add lookahead; a future hold should not block
a transfer;
- CanBookBeIssued: no lookahead; future hold does not block an issue;
- CanBookBeRenewed: idem.
- GetOtherReserves (only used in circ/returns): this call might be a
candidate for lookahead too, but I leave that for another report. It is
in the context of checkin and transfer, not checkout.
Test plan:
[1] Set ConfirmFutureHolds to zero days. (You may also need to enable
AllowHoldDateInFuture.)
[2] Place a hold with borrower A on biblio X for tomorrow. Also place a hold
with borrower B on X for today. (Use biblio level holds.)
[3] Check out item Y of X to borrower A. Ignore the warning for borrower B
and do not cancel the hold of B (so: confirm checkout).
Verify that X has still two holds.
[4] Check in Y (without confirming a hold).
[5] Enable ConfirmFutureHolds, say 2 days.
[6] Check out Y to A again. Ignore the warning for B (no cancel). Verify that
X now only has one hold for borrower B (the hold for A was filled).
Signed-off-by: Joonas Kylmälä <j.kylmala at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
-----------------------------------------------------------------------
Summary of changes:
C4/Barcodes/ValueBuilder.pm | 10 +-
C4/MarcModificationTemplates.pm | 15 +
C4/Members.pm | 4 +
C4/Reserves.pm | 3 +-
Koha.pm | 2 +-
Koha/Schema/Result/Item.pm | 4 +-
Koha/SimpleMARC.pm | 238 +++----
catalogue/detail.pl | 9 +-
cataloguing/value_builder/unimarc_field_4XX.pl | 18 +
...post-install-setup => koha-common.cron.monthly} | 14 +-
.../Bug-14098-Add_copy_and_replace_action.sql | 1 +
installer/data/mysql/updatedatabase.pl | 18 +
.../prog/en/modules/admin/preferences/admin.pref | 2 +-
.../prog/en/modules/catalogue/detail.tt | 7 +-
.../cataloguing/value_builder/unimarc_field_4XX.tt | 9 +
.../modules/tools/marc_modification_templates.tt | 10 +-
misc/cronjobs/crontab.example | 3 +
opac/oai.pl | 16 +
t/SimpleMARC.t | 662 +++++++++++++++++++-
t/db_dependent/Items.t | 16 +-
t/db_dependent/Members.t | 26 +-
t/db_dependent/Reserves.t | 53 +-
tools/marc_modification_templates.pl | 1 +
23 files changed, 994 insertions(+), 147 deletions(-)
copy debian/{koha-post-install-setup => koha-common.cron.monthly} (76%)
create mode 100644 installer/data/mysql/atomicupdate/Bug-14098-Add_copy_and_replace_action.sql
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list