[koha-commits] main Koha release repository branch 16.11.x updated. v16.11.07-23-g4029362
Git repo owner
gitmaster at git.koha-community.org
Sat May 13 14:52:41 CEST 2017
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, 16.11.x has been updated
via 4029362c2e48464c961385dbe3ca237323d7dead (commit)
via c4462d4305fca8f5e29d20cca200c9383f2627a1 (commit)
via ab690c505a54d936da89e4c05fce5639ed99576a (commit)
via 7b305bdce241112dd1cc7954c699cec809fbdd2f (commit)
via ca0f6e5bfdb85d071166c07c5b06fc1afd6c927d (commit)
via 93aea8afe56851e0660634f3e15f015edd5b9439 (commit)
via 5016a854cc0cd151106aedee12f746e60d9c3ff2 (commit)
via a7c25ccdd52cc3ae467651cadd3b4b89e5f69ff8 (commit)
via 6fa7c7d2bf7767427f9ccb421fe966097cbd34d7 (commit)
via 53555de5ecf82e6c7b3c07c6d0933c15febd49a4 (commit)
via 21956001c7466e1b51f7268dfa1e841464d9537d (commit)
via 04d50426b202f36da3d116c6dab8380329e5313f (commit)
via 91c0b29534aff07b4469ce4999386984ed2e9fd0 (commit)
via 609c2700886d32cf206726bdcd48e0f31fd7cd98 (commit)
via c8adec8e46ac16e7981e842c4e73923e19dd5910 (commit)
via dfc3a02e78faee1125f7046a6619c93e82ee9e06 (commit)
via ee1cf549c5cb54767ece9e95fdf1c80d240ad9ea (commit)
via e537b1c846f0c7f1b0ceec80712260bc7959eb6e (commit)
via 1bbcf3577238885c262a0de109c03f5987faa8b8 (commit)
via f3cf276c33208912387c0e8d683b07c995ef1de9 (commit)
via 1cc02f8bd29c6edc0895aed5cd26f89680e600e9 (commit)
via d9fa24e8bb9f43982773e1a79d629d2e8a2cbf2f (commit)
via 2695be154fdf9b3fc8b678fbcd7f62a2e139e2f9 (commit)
from cb487cbcaf3489bd8ff28e656af52ca8316fa63d (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 4029362c2e48464c961385dbe3ca237323d7dead
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Mon Mar 27 15:19:24 2017 +0200
Bug 17993 - Do not use modal authentication with CAS - tags bis
Bug 12046 corrected the fact that modal dialog does not allow to use the
CAS authentication in main authentication link. This must also be
corrected in link for tags in detail tags page: "Log in to see your own
saved tags."
Test plan :
- Enable syspref casAuthentication
- Go to OPAC, not authenticated
- Click on "Tag cloud"
- Click on "Log in to see your own saved tags"
=> Without patch you get the modal login popup
=> With patch you go to the login page opac-user.pl
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit f71e3a78b9ad35e7839271de80d89c9044c268c6)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit c4462d4305fca8f5e29d20cca200c9383f2627a1
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Wed Jan 25 14:47:02 2017 +0100
Bug 17993 - Do not use modal authentication with CAS - tags
Bug 12046 corrected the fact that modal dialog does not allow to use the CAS authentication in main authentication link.
This must also be corrected in link for tags in detail page : "Log in to add tags"
Test plan :
- Enable syspref casAuthentication
- Go to OPAC
- Go to a record detail page opac-detail.pl
- Click on "Log in to add tags"
=> Without patch you get the modal login popup
=> With patch you go to the login page opac-user.pl
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 34e813c8d053382313a804c8b2682f138f166926)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit ab690c505a54d936da89e4c05fce5639ed99576a
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Wed Jan 25 14:19:16 2017 +0100
Bug 17993 - Do not use modal authentication with CAS - lists
Bug 12046 corrected the fact that modal dialog does not allow to use the CAS authentication in main authentication link.
This must also be corrected in link of lists popup : "Log in to create your own lists"
Test plan :
- Enable syspref casAuthentication
- Go to OPAC
- Click on Lists > Log in to create your own lists
=> Without patch you get the modal login popup
=> With patch you go to the login page opac-user.pl
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit dc2a6e5d32fef1f57b03b2119b583d99356931f4)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 7b305bdce241112dd1cc7954c699cec809fbdd2f
Author: Marc Véron <veron at veron.ch>
Date: Sun Apr 9 16:58:21 2017 +0200
Bug 18405: Self checkout: Fix broken silent printing
Fix broken 'silent printing' (without printer dialog) in self checkout.
To reproduce:
Set up silent printing to slip printers as described in:
https://wiki.koha-community.org/wiki/Setting_up_slip_printer_to_print_silently
Verify that it works for check-outs in staff client.
Verify that it does not work in Self checkout.
To test:
Apply patch
Verify that silent printing works on SCO
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit a0cc3703bfb15f3f94a6eb66cb58e257cd89cf81)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit ca0f6e5bfdb85d071166c07c5b06fc1afd6c927d
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon May 1 14:15:58 2017 +0200
Bug 7550: [QA Follow-up] Resolve param warning from sco-patron-image
Resolve this warning:
CGI::param called in list context from package C4::Service line 212, this can lead to vulnerabilities. See the warning in "Fetching the value or values of a single named parameter" at /usr/share/perl5/CGI.pm line 436.
It comes from the require_params call in sco-patron-image.pl.
Git grepping on require_params tells me this:
members/default_messageprefs.pl:my ($categorycode) = C4::Service->require_params('categorycode');
opac/sco/sco-patron-image.pl:my ($borrowernumber) = C4::Service->require_params('borrowernumber');
opac/sco/sco-patron-image.pl:my ($csrf_token) = C4::Service->require_params('csrf_token');
svc/cataloguing/metasearch:my ( $query_string, $servers ) = C4::Service->require_params( 'q', 'servers' );
The only candidate for multi_param seems to be 'servers', but as we can see
this variable is a scalar. Additional servers returned by require_params are
lost. This should be solved on its own report.
So, we can safely add scalar to the params call, resolve the warning and
keep the same behavior.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit e96f39ab522512fe828940e93ba3737d5f25a16f)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 93aea8afe56851e0660634f3e15f015edd5b9439
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Apr 19 14:09:12 2017 -0300
Bug 7550: SCO - Restrict access of patron's image
With this patch if SelfCheckoutByLogin is set to 'username and
password', only the logged in user will be able to see the image linked
to his/her logged in account.
If set to "barcode" we generate a token but it can be easily generated.
You should add a warning in the about page if
SelfCheckoutByLogin="barcode" and ShowPatronImageInWebBasedSelfCheck="Show".
How I tested:
- Go to SCO
- Log - Enable self checkout, go to [Your
Server]//cgi-bin/koha/sco/sco-main.pl
- Log in with a user 'A' who has a patron image
- Copy the address of the patron image into an other browser window
- Change the borrowernumber to on of an other user 'B' having a patron
image
- Verify that the patron image is NOT displayed
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 57f28f9ee44a6c8f19dc1411971a7ca397557acd)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 5016a854cc0cd151106aedee12f746e60d9c3ff2
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed May 3 15:30:14 2017 -0300
Bug 18152: Add tests
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit a807d7199ea025aa507e0ca7e3ff2330902844f8)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit a7c25ccdd52cc3ae467651cadd3b4b89e5f69ff8
Author: Stephane Delaune <stephane.delaune at biblibre.com>
Date: Wed Feb 22 12:25:33 2017 +0100
Bug 18152 : fix unimarc label in SetMarcUnicodeFlag
The standard UNIMARC requires than the 9th character (starting from 0) in
labels must be blank (while it may be 'a' in marc21)
the problem is that C4::Charset::SetMarcUnicodeFlag (called in particular when
we import a record) always add 'a' char in the 9th label'pos whereas it should
do it just for MARC21 and NORMARC (not for UNIMARC) :
C4::Charset::SetMarcUnicodeFlag add 'a' char in the 9th label character for
MARC21 and NORMARC (it's normal), but just before doing this it call
"$marc_record->encoding('UTF-8')" which is a MARC::Record function which, when
called with 'UTF-8' parameter, do only one thing : add 'a' char in the 9th
label character
This patch only removes this incorrect function call, so, when we import a bib
record in UNIMARC : it no longer adds erroneous character (this does not change
anything for MARC21 and NORMARC because SetMarcUnicodeFlag explicitly adds 'a'
char in the 9th label for them)
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit bf551a07222a7b9beffd7ca6cba38c675aa3ab28)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 6fa7c7d2bf7767427f9ccb421fe966097cbd34d7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Apr 21 18:44:05 2017 -0300
Bug 18442: Add a test
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 9bf8142ee77dbacceca0cb17ed5f56ec07b3771c)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 53555de5ecf82e6c7b3c07c6d0933c15febd49a4
Author: Alex Buckley <alexbuckley at catalyst.net.nz>
Date: Thu Apr 20 11:29:28 2017 +1200
Bug 18442: Fix DB user loggin
Test plan:
1. Drop and recreate your db
2. Clear memcached
3. Go through the installer (to speed up this test plan install all
sample data so you dont have to create libraries, patron categories etc. later)
4. On the installer page login as the database user and notice that it
does not work on the first attempt ( you get 'Error: You do not have
permission to access this page')
5. Try logging in as database user for a second time and notice you are
logged in successfully this time
4. In staff interface create a patron account with superlibrarian permissions
5. Logout of the staff interface
6. Login as database user
7. Notice you cant log in. You get the 'Error:: You do not have permission to access this
page' error
8. Try a second attempt and notice you get the same error
9. Open the URL in a new tab and notice the staff interface appears
showing that you are logged in
10. log out and log back in as the superlibrarian user you created and
notice it works on first login attempt
11. Apply patch
12. Log out and try logging back in as database user and notice that you
can login successfully on first attempt
13. Repeat steps 1,2,3 and login as database user and notice the login
works on first attempt
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 416029ff2f3c9c689a5ea24372f4d940ccc71817)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 21956001c7466e1b51f7268dfa1e841464d9537d
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Apr 24 14:21:00 2017 +0000
Bug 18484 - opac-advsearch.tt missing closing div tag for .container-fluid
This patch corrects HTML validation errors by adding back a missing
</div> which was removed accidentally by Bug 9043 (2014!).
This patch also removes "border" attributes from <img> tags because the
attribute is obsolete.
To test, apply the patch and test the validity of the OPAC's advanced
search page. The only error should be one about 'Bad value
"api-server,"' which isn't really resolvable.
Signed-off-by: Barton Chittenden <barton at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 6f334aab06fd6e07f2ab8b399fbe50168d5818f4)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 04d50426b202f36da3d116c6dab8380329e5313f
Author: Marc Véron <veron at veron.ch>
Date: Fri Apr 21 21:22:44 2017 +0200
Bug 13835: Popup with searches: results hidden by language menu in footer
Language menus in pop up windows are not necessary and can hide the contents
(especially search results) on a narrow screen.
For an example, see screenshot in comment #3
This patch allows to mark pop p menus not to display the language footer.
To test:
- Reproduce issue from comment #3
- Apply patch
- Try to reproduce issue from comment #3
-> language menu should no longer display
- Verify that language menu is suppresed in 'Add to ist' as well
(from catalog search results, select an item, Add to:...)
Note: There will be more pop-ups with unwnated language selector.
That can be resolved in follow up bugs.
Followed test plan which worked as intended
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 9a9b0aab879d1decbdeb9bac02ae198a21a46afb)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 91c0b29534aff07b4469ce4999386984ed2e9fd0
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Apr 25 13:15:13 2017 +0000
Bug 17916 - "Delete MARC modification template" fails to actually delete it
The MARC modification templates' 'Delete' button fails because the event
handler has a "preventDefault" but the outcome of the confirmation
function must return true or false.
This patch removes the "preventDefault" from the .delete_template click
handler as well as a redundant onclick attribute from the delete link
itself.
To test, apply the patch and go to Tools -> MARC modification templates.
Clicking the delete button for any existing template should work
correctly.
Followed test plan, worked as intended
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 3fddc0d73724c6c5f1aafe6842c488304b79f306)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 609c2700886d32cf206726bdcd48e0f31fd7cd98
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Apr 25 16:16:49 2017 +0000
Bug 18419 - Broken patron-blank image in viewlog.tt
Because of a variable name collision the blank patron image doesn't
display in viewlog.tt. This patch moves the image from the template to
the stylesheet to avoid this problem.
This patch also replaces the blank patron image PNG file with an SVG
file. SVG support is wide enough to begin using whereever possible.
This patch also removes some inline CSS from circ-menu.inc and puts it
in the global stylesheet.
To test, apply the patch and clear your browser cache if necessary.
- Enable the patronimages system preference.
- View a patron account which lacks a patron image. All views (details,
fines, notices, etc) should show the "blank" patron image, including
the modification log view.
- View a patron account which has a patron image and check that it still
displays correctly in all views.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit dddd2691e704654fd656c5d519e029c5dfc3ecc9)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit c8adec8e46ac16e7981e842c4e73923e19dd5910
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Thu Jan 5 02:01:57 2017 +0000
Bug 15738: Show rental fees on OPAC summary page
This patch adds a few lines that check for a rental fee on an item. If
yes, it will show in brackets as a rental fee on the OPAC summary page.
To test:
1) Have a borrower with an overdue item accruing fines, a lost item and
an item with a rental fee. Confirm the Fines column on the OPAC summary
page now shows you what you may expect to see for each item.
Sponsored-by: Catalyst IT
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit ac2e6b1b2658405db63a17527895d3d7d46ec811)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit dfc3a02e78faee1125f7046a6619c93e82ee9e06
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Wed Apr 19 01:03:15 2017 +0000
Bug 18452: Correcting 'url' to say 'URL' in catalog detail
To test:
1) Edit a record, put a URL in 856u and hit save
2) Confirm that url shows as URL in OPAC and staff client
Sponsored-by: Catalyst IT
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 82943de12ca5170b9504044c20462542ae0e5397)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit ee1cf549c5cb54767ece9e95fdf1c80d240ad9ea
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Tue Apr 18 23:18:31 2017 +0000
Bug 15815: Reword confirm message when removing patrons from card batch
This patch rewords the confirm message when removing patrons from a card
batch.
From: "Are you sure you want to remove card number(s):1 from this
batch?"
To: "Are you sure you want to remove the selected patron(s) from this
batch?"
To test:
1) Go to Tools -> Patron Card Creator -> Manage batches
2) Edit a batch
3) Select one or more patrons and click 'Remove selected patrons' (not
individual Delete buttons)
4) Confirm the message is worded better and easier to understand
5) Click OK and confirm the patrons are deleted as expected
Sponsored-by: Catalyst IT
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 4ac0aab9bb8418a355e1f692e6b505500c96e0dd)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit e537b1c846f0c7f1b0ceec80712260bc7959eb6e
Author: phette23 <phette23 at gmail.com>
Date: Thu Apr 20 17:15:57 2017 -0700
Bug 18466: article requests box outline in opac
To test:
1) apply patch
2) ensure ArticleRequests is set to Enable
3) sign in as a user with no article requests on the OPAC side
4) click the 'article requests' tab & see the box & message
Sponsored-By: California College of the Arts
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 736afd6d0119304df3ec61e01e275aea1645e7ac)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 1bbcf3577238885c262a0de109c03f5987faa8b8
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Thu Jan 19 21:13:47 2017 -0500
Bug 15702: Recommended Counter-patch
As per comment #7, this patch affects AddMember and ModMember.
The test plan should be the same as comment #6.
Secondary patch with tests still to come.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 7fd248f3e9c80b36fb451eb90d2c34242c0cbb61)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit f3cf276c33208912387c0e8d683b07c995ef1de9
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Fri Apr 21 08:58:03 2017 -0400
Bug 15702: Add test cases for modified code
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 31378adbe1add83afd2ac77520a295c18ba70b72)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 1cc02f8bd29c6edc0895aed5cd26f89680e600e9
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Apr 24 14:16:34 2017 -0300
Bug 18457: Add tests
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 41669b45a808550088146380d534e4f3629590d9)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit d9fa24e8bb9f43982773e1a79d629d2e8a2cbf2f
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Apr 19 09:52:38 2017 -0400
Bug 18457 - process_message_queue.pl will die if a patron has no sms_provider_id set but sms via email is enabled for that patron
If SMS via Email is enabled, and a patron has opted for SMS messages, but has not selected a service provider, the cronjob will die with the error
Can't call method "domain" on an undefined value at /usr/share/koha/lib/C4/Letters.pm line 1055.
This will cause all messages that come after the error to not be sent!
Test Plan:
1) Enable SMS via Email
2) Enable SMS for a patron, but don't set a provider
3) Perform an action that will trigger an sms message to go into
the holds queue ( item due, item checkout, etc )
4) Run process_message_queue.pl, note the error
5) Apply the patch
4) Run process_message_queue.pl, no error this time!
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit c7541091741878d28f648df8681a691cf787334c)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 2695be154fdf9b3fc8b678fbcd7f62a2e139e2f9
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Apr 14 13:07:39 2017 -0400
Bug 18435 - Language entered in Materials Specified does not display when items are checked out and checked in
This problem stems from bug 17642, if items.materials is not linked to
an authorized value the contents are being tossed out. We shuold display
them instead
To test:
1 - Ensure items.materials 952$3 is not mapped to an authorized value
2 - Add a value to an item
3 - Check the item out, note the materials does not display
4 - Check the item in, note the materials does not display
5 - Apply patch
6 - Check the item out, note the materials does display
7 - Check the item in, note the materials does display
Followed test plan, message about material displays as expected
whil checking out and in.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 330ecff1de417c40e5a48040a6f7df6436097bc4)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 2 +
C4/Charset.pm | 1 -
C4/Letters.pm | 4 +
C4/Members.pm | 15 ++
C4/Service.pm | 2 +-
circ/circulation.pl | 2 +-
circ/returns.pl | 2 +-
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 18 +++
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 8 +-
.../prog/en/includes/intranet-bottom.inc | 2 +-
.../prog/en/modules/catalogue/detail.tt | 4 +-
.../prog/en/modules/common/patron_search.tt | 1 +
.../prog/en/modules/patroncards/edit-batch.tt | 5 +-
.../modules/tools/marc_modification_templates.tt | 2 +-
.../en/modules/virtualshelves/addbybiblionumber.tt | 2 +-
.../intranet-tmpl/prog/img/patron-blank.min.svg | 1 +
koha-tmpl/intranet-tmpl/prog/img/patron-blank.png | Bin 1559 -> 0 bytes
.../prog/js/marc_modification_templates.js | 3 +-
.../opac-tmpl/bootstrap/en/includes/masthead.inc | 7 +-
.../bootstrap}/en/includes/slip-print.inc | 6 +-
.../bootstrap/en/modules/opac-advsearch.tt | 27 ++--
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 11 +-
.../opac-tmpl/bootstrap/en/modules/opac-tags.tt | 9 +-
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 170 ++++++++++----------
.../bootstrap/en/modules/sco/printslip.tt | 16 +-
.../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 2 +-
opac/opac-user.pl | 4 +
opac/sco/sco-main.pl | 3 +-
opac/sco/sco-patron-image.pl | 22 ++-
t/Charset.t | 27 +++-
t/db_dependent/Auth.t | 16 +-
t/db_dependent/Letters.t | 15 +-
t/db_dependent/Members.t | 4 +-
33 files changed, 280 insertions(+), 133 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/img/patron-blank.min.svg
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/patron-blank.png
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/bootstrap}/en/includes/slip-print.inc (81%)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list