[koha-commits] main Koha release repository branch master updated. v3.20.00-498-gc4a4581
Git repo owner
gitmaster at git.koha-community.org
Wed Sep 2 19:44:30 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 c4a4581a50681a35cedda43758a49a8b567c40a9 (commit)
via c1d9a2c7709be5eefb6e4bb9a6fd280e8ce430b5 (commit)
via eb12ee1e223b662cd1e89c0a56a5d1c083ba1ddc (commit)
via 085d766a0524e399d0c9c9e807d8c0acd0da6a19 (commit)
via f7214859df15abfe874141bcc1a32b57067f7c54 (commit)
via 6e0b61e2acea7c797c1da727474daf7d7a657574 (commit)
via d1335a766d7b54c470701b0055fc99be2e7e7628 (commit)
via 22b41063981de608402d1dd87f6aa9e2010245dd (commit)
from 813a047e236947a815c4be3c3dde38f19844b962 (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 c4a4581a50681a35cedda43758a49a8b567c40a9
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon May 25 17:01:46 2015 +0200
Bug 13972: Follow-up - Add unit tests for changed parts of SendAlerts
To test:
- prove t/db_dependent/Letters.t
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit c1d9a2c7709be5eefb6e4bb9a6fd280e8ce430b5
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon May 25 14:53:29 2015 +0200
Bug 13972: Include fields from subscription and serial table in serial notification email
Currently it's not possible to include information about which
issue has arrived in the serial notification notice the patron
can subscribe to from the OPAC.
The patch makes the fields from the subscription and serial
table available to the notice template.
In order to be able to print information about the correct
issue, the GetAlert has been modified to expext the serialid
as externalid when the module is issue.
git grep SendAlerts (only call with 'issue' is in Serial.pm)
To test:
- Add a subscription, select a patron notification template
- Search for the record in the OPAC
- Go to the subscription tab - More details
- Subscribe to the notification
- Edit the notice template you selected for the subscription
- add fields from subscription
- add fields from serial (serial.serialseq has the issue
information)
- Receive an issue for the subscription
- Check that you have received the notification and that
all information has been printed correctly
NOTE: notice is sent directly, not through the message_queue
Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit eb12ee1e223b662cd1e89c0a56a5d1c083ba1ddc
Author: Jonathan Druart <jonathan.druart at 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.gupta at informaticsglobal.com>
Signed-off-by: Joonas Kylmälä <j.kylmala at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Warning message is triggered.
Adding, editing and deleting item types still works.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 085d766a0524e399d0c9c9e807d8c0acd0da6a19
Author: Jonathan Druart <jonathan.druart at 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 <mirko at abunchofthings.net>
Signed-off-by: Joonas Kylmälä <j.kylmala at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit f7214859df15abfe874141bcc1a32b57067f7c54
Author: Jonathan Druart <jonathan.druart at 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 <nick at quecheelibrary.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Much better!
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 6e0b61e2acea7c797c1da727474daf7d7a657574
Author: Jonathan Druart <jonathan.druart at 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 <tomascohen at theke.io>
commit d1335a766d7b54c470701b0055fc99be2e7e7628
Author: Marcel de Rooy <m.de.rooy at 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.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 22b41063981de608402d1dd87f6aa9e2010245dd
Author: Srdjan <srdjan at 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.rooy at 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.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
-----------------------------------------------------------------------
Summary of changes:
C4/Biblio.pm | 2 +
C4/HTML5Media.pm | 2 +-
C4/Letters.pm | 21 ++++-
C4/Serials.pm | 2 +-
acqui/addorder.pl | 2 +-
acqui/addorderiso2709.pl | 2 +-
acqui/finishreceive.pl | 3 +-
admin/itemtypes.pl | 38 ++++++----
.../prog/en/modules/admin/itemtypes.tt | 16 ++++
.../prog/en/modules/cataloguing/additem.tt | 52 +++++++------
t/Biblio/TransformHtmlToXml.t | 80 ++++++++++++++++++++
t/db_dependent/Letters.t | 43 ++++++++++-
tools/letter.pl | 3 +
13 files changed, 217 insertions(+), 49 deletions(-)
create mode 100644 t/Biblio/TransformHtmlToXml.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list