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.20.x has been updated
via f8b1b50cf8beb03042f69bb771eb99f99599dce3 (commit)
via 3f866a732ed78e5366e0c07ecaef5729f6414e4e (commit)
via 6648417079eb9aa04d9283e55f3e9f263ef13d64 (commit)
via 3d8e059513db08f2070e33ea1562d7cdd915797c (commit)
via c7dfbfedd3d298753b4d96d5ce50363c2cfc65fc (commit)
via 84ee44110a934632ddcc8da59aa805c45a79786e (commit)
via 5ef7a1795f72509aba182b9b3abc8e60b796a3a0 (commit)
via 0f07cd2c1004e3ceb2c4436f9cd3542b243c18aa (commit)
via 8641fba15ccc43aa6f0ea6762fb5f54880065150 (commit)
via 7feee800440fc3749b5896de82c24ad9860f6bd3 (commit)
via 272650cb3f1e2d3ac24559ede0049b263b829762 (commit)
via 28fe340ea75475903a1063f734dec45781d35f90 (commit)
via e76def3a946d39bc56737236554be6aa21c725a9 (commit)
via 1ed31fe5ba874a649d34beb0fb649bd912fe456d (commit)
via eb8a20b2b77549b5afd530e58208a78ef68e295a (commit)
via 27ba1a6fa1a5be170d9bf04747f31caab15766b1 (commit)
via 74e46b7467aa69e5a77d0b7689ddd2d24d76805d (commit)
via 172dce8b0dcc7870279c8571b386392d31124d81 (commit)
via 270187404e87bdae985e70a590834ed2dc5d49c7 (commit)
via 01af0c4dc7b575f914753b265fc958f25ac30b9a (commit)
via 25f30fec2d93b7c0678a131d65da3c3c8ae8c18c (commit)
via c158f9e27e9e283523a5070ae4e4c718627374d2 (commit)
via c14c5d180d038e3b772693beed2d20c1c091d95c (commit)
via 640ad36da42868ec64f6fcf342cf32636179505d (commit)
via 5d3e837a5dff36afb24b76d518e745283d1b2086 (commit)
via 2a9d47ea610081e6d1dda9dbbbdac0349263a2d3 (commit)
via 5f6d7f62711286273abb1fa352bd16405a7e9862 (commit)
from dbf96d4f40b6074194c0504e349fe4a7031466d4 (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 f8b1b50cf8beb03042f69bb771eb99f99599dce3
Author: Fridolin Somers <fridolin.som...@biblibre.com>
Date: Thu Aug 6 09:36:42 2015 +0200
Bug 14649: Followup - correct budget_period_id in fund name link
Now that fund name is displayed in the table as a link, you see that arg
budget_period_id is never defined in this link.
This is because the template var is [% budget_line.budget_period_id %]
instead of [% budget_period_id %].
This looks like a mistake when converting from tmpl to tt.
Test plan :
- Without patch
- Look for a planning with funds :
/cgi-bin/koha/admin/aqplan.pl?budget_period_id=2&authcat=MONTHS
- Click on a fund name
=> You see in URL that budget_period_id is empty :
/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=6&budget_period_id=
- Apply patch
- Look for a planning with funds :
/cgi-bin/koha/admin/aqplan.pl?budget_period_id=2&authcat=MONTHS
- Click on a fund name
=> you see in URL that budget_period_id is defined like in planning page :
/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=6&budget_period_id=2
Signed-off-by: Chris Cormack <chr...@catalyst.net.nz>
Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
(cherry picked from commit fc4f7fe67577917df9ca4201257bea822832a3c4)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
commit 3f866a732ed78e5366e0c07ecaef5729f6414e4e
Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Date: Thu Aug 6 07:19:06 2015 +0100
Bug 14649: Fix regression - display fund name on budget planning
A patch from bug 11714 removes 'budget_name_indent', which was useless.
The script and the template should use the budget_name value.
Note that this patch impacts the CSV export, which does not work, so it
cannot be
tested.
Test plan:
Edit a fund and click on one of the Planning value (by months, etc.)
The "Fund name" column should be correctly populated with the fund
names.
Signed-off-by: Fridolin Somers <fridolin.som...@biblibre.com>
Signed-off-by: Chris Cormack <chr...@catalyst.net.nz>
Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
(cherry picked from commit e0ed9cbcf60a74dbe2690e6c34c5a311744f49ae)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
commit 6648417079eb9aa04d9283e55f3e9f263ef13d64
Author: Blou <philippe.blo...@inlibro.com>
Date: Wed Sep 2 09:59:45 2015 -0400
Bug 14726: Checkout summary doesn't show title
Right after checking out, a small box appear with "Checkout out: Some Title
(32154001669305). Due on 24/09/2015".
The title doesn't appear anymore (since the move to db schemas). This fixes
it.
Test:
1) checkout ANY item, for ANY user
2) Look at summary right below the checkout input box. The title doesn't
show up.
3) apply patch, reproduce same steps (after checkin if same item). Title
appears.
Signed-off-by: Andreas Hedström Mace <andreas.hedstrom.m...@sub.su.se>
Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Todo: You need to track what are the queries generated here.
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
(cherry picked from commit 658e787834784dec7d7782f45061b66e22211423)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
commit 3d8e059513db08f2070e33ea1562d7cdd915797c
Author: Fridolin Somers <fridolin.som...@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 <mi...@abunchofthings.net>
Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
(cherry picked from commit 64992a05ce87af7bf595c8d6f0b9d528887a2e44)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
commit c7dfbfedd3d298753b4d96d5ce50363c2cfc65fc
Author: Julian Maurice <julian.maur...@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.dru...@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
(cherry picked from commit abd71d017ea68f4209e41b34282e8fce8170e175)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
commit 84ee44110a934632ddcc8da59aa805c45a79786e
Author: Paul Poulain <paul.poul...@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 <chr...@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.dru...@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
(cherry picked from commit 503dd6036974b4208bd5cd60a87bb28599987f45)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
commit 5ef7a1795f72509aba182b9b3abc8e60b796a3a0
Author: Tomas Cohen Arazi <tomasco...@theke.io>
Date: Mon Sep 7 11:12:49 2015 -0300
Bug 14717: DBRev 3.21.00.023
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
(cherry picked from commit db891d33f0bbe75748fd725036066f45c2e762fe)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
Conflicts:
Koha.pm
commit 0f07cd2c1004e3ceb2c4436f9cd3542b243c18aa
Author: Jonathan Druart <jonathan.dru...@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.dru...@bugs.koha-community.org>
http://bugs.koha-community.org/show_bug.cgi?id=14717
Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
(cherry picked from commit 69994c38a00a1199b814d823c4e20503d86b28bf)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
commit 8641fba15ccc43aa6f0ea6762fb5f54880065150
Author: Jonathan Druart <jonathan.dru...@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.dru...@bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
(cherry picked from commit 7bad40dcc294d6d56c937cbd81267fc9df73b6aa)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
Conflicts:
t/db_dependent/Members.t
commit 7feee800440fc3749b5896de82c24ad9860f6bd3
Author: Chris Cormack <chr...@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 <eugen...@yahoo.com>
Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
(cherry picked from commit d8a9d171154f3ad526f31968fdec1ad7809014b8)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
commit 272650cb3f1e2d3ac24559ede0049b263b829762
Author: Jonathan Druart <jonathan.dru...@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 <ve...@veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
(cherry picked from commit 5b521eb394771ee305777f0b44098be5fdd11cc7)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
commit 28fe340ea75475903a1063f734dec45781d35f90
Author: Jonathan Druart <jonathan.dru...@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 <ve...@veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
(cherry picked from commit bcab2416399e93f5ce9b1083395c052046d5d02a)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
commit e76def3a946d39bc56737236554be6aa21c725a9
Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Date: Fri Jul 10 16:11:48 2015 +0100
Bug 12965: Prevent to erase an existing item type
On creating an item type, if it already exists, it will replace the
existing one.
This patch prevent that and display a message to the interface.
Note: The fields are lost.
Test plan:
1/ Create an item type 'AAA', description 'AAA'
2/ Edit it, update the description with 'BBB'
3/ Create an item type 'AAA' with a description 'CCC' => you should get
a warning "already exists".
Works well, no errors
Signed-off-by: Amit Gupta <amit.gu...@informaticsglobal.com>
Signed-off-by: Joonas Kylmälä <j.kylm...@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
Warning message is triggered.
Adding, editing and deleting item types still works.
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
(cherry picked from commit eb12ee1e223b662cd1e89c0a56a5d1c083ba1ddc)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
commit 1ed31fe5ba874a649d34beb0fb649bd912fe456d
Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Date: Wed Jul 15 12:49:03 2015 +0100
Bug 12885: Fix if url contains +*... and HTML5 Media is enabled
The special regex chars are not escaped in C4::HTML5Media.
Test plan:
1/ Set 856$u=http://www.mrqe.com/lookup?talented+mr.+ripley
2/ Enable the pref HTML5Media
3/ Go on the detail page
It should not explode.
Signed-off-by: Mirko Tietgen <mi...@abunchofthings.net>
Signed-off-by: Joonas Kylmälä <j.kylm...@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
(cherry picked from commit 085d766a0524e399d0c9c9e807d8c0acd0da6a19)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
commit eb8a20b2b77549b5afd530e58208a78ef68e295a
Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Date: Mon Jul 13 17:34:53 2015 +0100
Bug 13943: Prevent the deletion of items if the user cancels
On the edit items page, there is some weird JS code: if the user clicks
on the delete link and then cancel, the item is deleted anyway.
It's caused by the following JS code in browser.js
$('a[href*="biblionumber="]').click(function (ev) {
ev.preventDefault();
window.location = $(this).attr('href') + '&searchid=' + me.searchid;
});
Test plan:
- Do a search with multiple results
- Go to the detail page (make sure results browser shows up!)
- Use the "Edit items" link from the toolbar
- Delete an item (try both way)
- Choose "cancel"
- Delete an item (try both way) and confirm the deletion
You should see the browser after the deletion and the item should have
been deleted correctly.
- Edit an item (try both way)
You should see the browser (did not work before this patch)
Note: Before this patch, the 2 first columns didn't contain the
edit/delete item links, now it's only the 1st one.
Signed-off-by: Nick Clemens <n...@quecheelibrary.org>
Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
Much better!
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
(cherry picked from commit f7214859df15abfe874141bcc1a32b57067f7c54)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
commit 27ba1a6fa1a5be170d9bf04747f31caab15766b1
Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Date: Wed Sep 2 15:07:07 2015 +0100
Bug 11247: Improve tests
This patch makes the tests non dependent on the DB and test the 3 marc
flavours.
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
(cherry picked from commit 6e0b61e2acea7c797c1da727474daf7d7a657574)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
commit 74e46b7467aa69e5a77d0b7689ddd2d24d76805d
Author: Marcel de Rooy <m.de.r...@rijksmuseum.nl>
Date: Wed Aug 26 14:09:53 2015 +0200
Bug 11247: Add a simple unit test for TransformHtmlToXml
The unit test is db dependent (as Jonathan correctly remarked),
since the sub checks a preference.
Test plan:
Run t/db_dependent/Biblio/TransformHtmlToXml.t
Signed-off-by: Marcel de Rooy <m.de.r...@rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
(cherry picked from commit d1335a766d7b54c470701b0055fc99be2e7e7628)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
commit 172dce8b0dcc7870279c8571b386392d31124d81
Author: Srdjan <srd...@catalyst.net.nz>
Date: Thu Nov 14 19:10:30 2013 +1300
Bug 11247: Fix calls of TransformHtmlToXml
The ind_tag of TransformHtmlToXml is unused.
Some calls to this function incorrectly revert indicator and ind_tag (which
is not a problem when both are empty..)
Patch of Srdjan Jankovic, amended and signed off by Marcel de Rooy.
The following calls are fixed:
call in acqui/addorder.pl: switched indicator with ind_tag
call in acqui/addorderiso2709.pl replaced too
acqui/finishreceive.pl replaced too
These calls are fine:
two calls in cataloguing/additem.pl are fine
call in serials/serials-edit.pl is fine
call in tools/batchMod.pl is fine
The folllow-up patch adds a simple unit test.
Signed-off-by: Marcel de Rooy <m.de.r...@rijksmuseum.nl>
With AcqCreateItem=='placing an order', tested if adding an order still
worked (covered both addorder.pl and addorderiso2709.pl).
Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
(cherry picked from commit 22b41063981de608402d1dd87f6aa9e2010245dd)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
commit 270187404e87bdae985e70a590834ed2dc5d49c7
Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Date: Tue Aug 18 18:40:31 2015 +0100
Bug 14584: Encoding broken with system preferences
The pref are double encoded.
From bug 12411:
"This will fix the encoding issues existing in 3.14 and 3.16.
The issue still appear in master but is fixed by bug 11944."
They should not have been pushed together.
Test plan:
1) You need an accentuated language installed.
2) Go to NoLoginInstructions pref, and add some accentuated message like
"Hélo médames é mècieüx"
3) refresh opac home page, message should be gibberish
4) apply patch. Message should be ok now.
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
Works as expected.
Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
Signed-off-by: Tomas Cohen Arazi <tomasco...@unc.edu.ar>
(cherry picked from commit 813a047e236947a815c4be3c3dde38f19844b962)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
commit 01af0c4dc7b575f914753b265fc958f25ac30b9a
Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Date: Mon Aug 24 10:07:37 2015 +0100
Bug 14709: Do not access to C4::Context->userenv from the commandline
The script dies with
Can't use an undefined value as a HASH reference at tools/export.pl
line 149.
if it is called from the command line.
This is introduced by bug 13040.
The C4::Context->userenv is not defined in this case.
Test plan:
Execute the script using the command line.
With the patch applies you should not get the error.
Signed-off-by: Joonas Kylmälä <j.kylm...@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
Signed-off-by: Tomas Cohen Arazi <tomasco...@unc.edu.ar>
(cherry picked from commit 6ad59e7ab45bbd2858f4cfad83d862688a48e49b)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
commit 25f30fec2d93b7c0678a131d65da3c3c8ae8c18c
Author: Tomas Cohen Arazi <tomasco...@unc.edu.ar>
Date: Wed Sep 2 09:49:41 2015 -0300
Bug 14205: (RM followup) DBIx updates
Signed-off-by: Tomas Cohen Arazi <tomasco...@unc.edu.ar>
(cherry picked from commit ce2ea94f304b8e3a0c5fa6c967c2b864e5d0e7bc)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
commit c158f9e27e9e283523a5070ae4e4c718627374d2
Author: Tomas Cohen Arazi <tomasco...@unc.edu.ar>
Date: Wed Sep 2 09:45:35 2015 -0300
Bug 14205: DBRev 3.20.03.001
Signed-off-by: Tomas Cohen Arazi <tomasco...@unc.edu.ar>
(cherry picked from commit 4e69b25e71fcb74ce3c2d3830deafdd1569fe361)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
Conflicts:
Koha.pm
commit c14c5d180d038e3b772693beed2d20c1c091d95c
Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Date: Tue Aug 4 10:00:51 2015 +0100
Bug 14205: Deleting an Item/Record does not remove link to course reserve
A constraint is missing on the course_reserves.ci_id field.
This patch adds it and removes orphan rows.
Test plan:
0/ Don't apply the patch
1/ Login to Staff Site.
2/ Go to Course Reserves
3/ Create Course
4/ Add Reserve
5/ Go to item added (delete item/record)
6/ Refresh Course (see no items attached)
7/ Delete Course
8/ See course still listed in the courses (Not deleted)
9/ Apply the patch and execute the updatedatabase entry.
10/ Delete the Course
Note that the course has correctly been removed.
NOTE: Make sure to set the UseCourseReserves system preference to test.
Tested before (problem existed) and after (problem solved) update.
Dropped DB, web installed, and put in dummy data and retested.
Problem solved.
Signed-off-by: Mark Tompsett <mtomp...@hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
Signed-off-by: Tomas Cohen Arazi <tomasco...@unc.edu.ar>
(cherry picked from commit fc568dfb22238a052d7772a0bba374f836543d46)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
commit 640ad36da42868ec64f6fcf342cf32636179505d
Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Date: Tue Aug 18 09:08:09 2015 +0100
Bug 14685: Fix set guarantor for a child or professional accounts
Bug 13970 removed some useful code to automatically set the guarantor
when creating a child.
But finally there is a better way to do the job, we just need to assume
that only children or professional can have a guarantor.
Test plan:
1/ Create an adult patron and add a child.
2/ The guarantor info should be retrieved and set on the child creation
page.
3/ Create an organization and add a child
4/ The guarantor info should be retrieved and set on the adult creation
page.
Signed-off-by: Liz Rea <l...@catalyst.net.nz>
This patch catches both cases, thanks Jonathan!
Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
Signed-off-by: Tomas Cohen Arazi <tomasco...@unc.edu.ar>
(cherry picked from commit 438b62e8ffcbab3742ab9a48602a9653b1afde6f)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
commit 5d3e837a5dff36afb24b76d518e745283d1b2086
Author: Joonas Kylmälä <j.kylm...@gmail.com>
Date: Tue Aug 25 07:24:54 2015 +0000
Bug 14703: Holidays description shows \r\n for every new line
Adds a new line for the holiday's description instead of the string
\r\n.
Test plan:
1. In tools -> Calendar look at some holiday's description
(Do a new holiday with description of multiple lines if
there is not already)
2. Notice that there is characters \r\n if someone has put
a newline in the holiday's description
3. Apply patch
4. See that the new lines show there now nicely
Sponsored-by: Vaara-kirjastot
Signed-off-by: Marcel de Rooy <m.de.r...@rijksmuseum.nl>
Amended slightly: no need to replace title.
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
(cherry picked from commit fa1311894906821e2b6bc9e4e3a831a855a20bca)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
commit 2a9d47ea610081e6d1dda9dbbbdac0349263a2d3
Author: Tomas Cohen Arazi <tomasco...@theke.io>
Date: Thu Aug 27 11:31:42 2015 -0300
Bug 14737: wrong permissions required for cn_browser.pl plugin
The cn_browser.pl cataloguing plugin only searches for used callnumbers
on the bibliographic database. There is no need for this plugin to
require special permissions besides access to the catalog.
To test:
- Link the cb_browser.pl cataloguing plugin to 952$o in your favourite
cataloguing framework
- Login with a superlibrarian user
- Try the plugin
=> SUCCESS: you can use it
- Login with a user that has the full 'tools' permission
- Try the plugin
=> SUCCSES: you can use it
- Login with a user that doesn't have full 'tools' permission
but has the normal catalogue and cataloguing permissions.
- Try the plugin
=> FAIL: you are requested to login with a different user
- Apply the patch
- Retry
=> SUCCESS: you can use it
- Sign off :-D
Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Signed-off-by: Marcel de Rooy <m.de.r...@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
(cherry picked from commit b348c07f969a5bd17f25e5ced681ad44aa351c0e)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
commit 5f6d7f62711286273abb1fa352bd16405a7e9862
Author: Joonas Kylmälä <j.kylm...@gmail.com>
Date: Wed Aug 19 11:00:27 2015 +0000
Bug 14579: 'You are not logged in' should link to log in page
To test:
1) Go to any page on the staff client and make sure you are not logged in
(ie an error page, cgi-bin/koha/errors/400.pl)
2) Try click on 'You are not logged in |'
3) Notice it is not really a link and doesn't take you anywhere
4) Apply patch
5) Refresh page
6) Click on what now says 'Log in |'
7) Confirm that you are redirected to the intranet log in page
Signed-off-by: Aleisha <aleishaamo...@hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
(cherry picked from commit 255d133acac24a675dca0106ede20359257d0701)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
-----------------------------------------------------------------------
Summary of changes:
C4/Barcodes/ValueBuilder.pm | 10 ++-
C4/Biblio.pm | 2 +
C4/HTML5Media.pm | 2 +-
C4/Members.pm | 4 +
Koha.pm | 2 +-
Koha/Schema/Result/CourseItem.pm | 19 ++++-
Koha/Schema/Result/CourseReserve.pm | 22 +++++-
Koha/Template/Plugin/Koha.pm | 3 +-
acqui/addorder.pl | 2 +-
acqui/addorderiso2709.pl | 2 +-
acqui/finishreceive.pl | 3 +-
admin/aqplan.pl | 5 +-
admin/itemtypes.pl | 38 ++++++----
catalogue/detail.pl | 9 ++-
cataloguing/value_builder/cn_browser.pl | 2 +-
cataloguing/value_builder/unimarc_field_4XX.pl | 18 +++++
installer/data/mysql/kohastructure.sql | 4 +-
installer/data/mysql/updatedatabase.pl | 34 +++++++++
.../intranet-tmpl/prog/en/css/staff-global.css | 2 +-
.../intranet-tmpl/prog/en/includes/header.inc | 19 +++--
.../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 2 +-
.../prog/en/modules/admin/itemtypes.tt | 16 ++++
.../prog/en/modules/catalogue/detail.tt | 7 +-
.../prog/en/modules/cataloguing/additem.tt | 52 +++++++------
.../cataloguing/value_builder/unimarc_field_4XX.tt | 9 +++
.../prog/en/modules/circ/circulation.tt | 2 +-
.../prog/en/modules/tools/holidays.tt | 2 +-
members/memberentry.pl | 3 +-
opac/oai.pl | 16 ++++
t/Biblio/TransformHtmlToXml.t | 80 ++++++++++++++++++++
t/db_dependent/Members.t | 26 ++++++-
tools/export.pl | 2 +-
32 files changed, 343 insertions(+), 76 deletions(-)
create mode 100644 t/Biblio/TransformHtmlToXml.t
hooks/post-receive
--
main Koha release repository
_______________________________________________
koha-commits mailing list
koha-commits@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-commits
