[koha-commits] main Koha release repository branch master updated. v18.11.00-289-g9e79de6
Git repo owner
gitmaster at git.koha-community.org
Mon Jan 28 15:27:07 CET 2019
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 9e79de6ef2d1662d04018203d2f9ff48be8a0f0f (commit)
via ae84cf1e7a512ce198e5fe7e0b4dd3930967ba76 (commit)
via 380e57ed72aa3b11e91b3897501b9966392a3eaf (commit)
via 9b69ceeac64850dce05b56c978856bd5d1c43b06 (commit)
via 0584d96bc082b5a7ab2b80af69fe2b7cebcbd188 (commit)
via 590aa0ddd9c9d9cd0d2ab1d50380e9714baf432a (commit)
via 7dbf36e83f81371588aeb60a61e5619e9ca9c7f2 (commit)
via be7592894fc1bdd45406dcfd0a4350fd55596201 (commit)
via f6599b2c5480d2e096bac71e4e7ac759686b9fbc (commit)
via 809d5bfbfe95e5a4797898b2381788546cb3a804 (commit)
via de52519422f5488ca9697050a44994f04aa41cc7 (commit)
via d2ac9d9df825f029d7e6010ab1928d0f547c1aeb (commit)
via 1169b729ef43fe5109301d2793f8d94e10eaf245 (commit)
via 3ee95bd0213943b625ea5a35eb04e45835cf6f65 (commit)
via fe8c269509f122e0bda48e0d1ac28be2d04dfa01 (commit)
via 85432a1f4cc7d4bcb9e2533ff0c56416dae150a1 (commit)
via 14d6a10de992db89b4730c37fc0d0b86f7467378 (commit)
via cdf0d7640f379d67231c183a1fe9d3a6497871bc (commit)
via bf48a24277bb65b348a55c2c9214d97b570329c2 (commit)
via e7b26fcdf05656f45d3741b9607d616f42d56f70 (commit)
via 77a99065462b802f7931b21a8e2a6e0a755ad6eb (commit)
via abf19383ed3c1e594b75df4cdaf24d6505128a12 (commit)
via ac840a846011f8f6f24686ef68f73e7b59f9704e (commit)
via 094a1cb0703b22d18c061cdc4879c1fc3c76ea80 (commit)
via 63f897c06eb96f75d26e0d43a9ca0251919c641d (commit)
via 89d4b5ea58f2029f13f4cfa2a652fd4cf900faa9 (commit)
via a4b38a18b33c6551629af5261980bbaf0a4059b6 (commit)
via 3f7b2fa41898f59ce39d1725f8dfe6001095f796 (commit)
via dfa883bbd00af6c86397d34f3c202e4d9d20d5bf (commit)
via 358adce2e75bdd317165c86a9b5064bc52d9e2ad (commit)
via d58a477c56d33df586b60ba9d8ffccf719750468 (commit)
via 5c547ffff2ca04a87695a57e972171cd76cc828c (commit)
via 1d5934cae52dd96d9c5b8685a5f5531c69e92df8 (commit)
via 92db2e74fd3cd761ae67d2f7573ee03d32d0a8ed (commit)
via 11ce911915a237047d8168876849de3df2b3b2e0 (commit)
via 5b4cbb1643aa20ada17c3f73df3e59dfc5a3dbd8 (commit)
via 36df53ad8d4987e938e478d934d553b73e7450f2 (commit)
via cfd59672bb09c4766632de4c6f11cf9cf4bea3f9 (commit)
via 258c538e76914e6c2023242b555bb38c6f1970b9 (commit)
via 5ab46bc24573165e540a1a287ea3438637c938e3 (commit)
from 5e1fd6218c8c3ac991d7a04f1c0b6169b8b7743c (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 9e79de6ef2d1662d04018203d2f9ff48be8a0f0f
Author: Jasmine Amohia <jasmineamohia.student at wegc.school.nz>
Date: Wed Jan 16 23:10:35 2019 +0000
Bug 22149: Fixed grammar in the manage_circ_rules_from_any_libraries description
Test plan:
1. Review patch and confirm that the sentence makes sense
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ae84cf1e7a512ce198e5fe7e0b4dd3930967ba76
Author: Jack Kelliher <jke0429 at stacmail.net>
Date: Tue Jan 15 03:24:17 2019 +0000
Bug 21930: Reworded message on permissions.inc
1. Go to patrons account, more, Set Permissions.
2. Dropdown the Parameters section.
3. Text should display "If not set the logged in user could only edit
circulation rules for its the own library (please note that
manage_circ_rules is still required)"
4. Apply patch and reload page
5. Text should now display "Edit circulation rules from any library. If
not set the logged in user could only edit circulation rules for their
own library (please note that manage_circ_rules is still required)"
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 380e57ed72aa3b11e91b3897501b9966392a3eaf
Author: helene hickey <hickeyhe at wgc.school.nz>
Date: Tue Jan 15 21:08:47 2019 +0000
Bug 22029: Google plus has been removed from the social links.
For testing:
1) Make sure SocailNetworks is enabled
2) Find a book and verify that in the social links, there is a Google
Plus option
3) apply patch and verify that the Google Plus option is no longer there
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 9b69ceeac64850dce05b56c978856bd5d1c43b06
Author: Jasmine Amohia <jasmineamohia.student at wegc.school.nz>
Date: Tue Jan 15 21:34:32 2019 +0000
Bug 20569: Improved description of CheckPrevCheckout system preference
The CheckPrevCheckout preference can be overriden by a setting in the
patron categories, I've edited the options to reflect this.
Test plan:
1. Check the CheckPrevCheckout system preferences and confirm that the
options are clear
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 0584d96bc082b5a7ab2b80af69fe2b7cebcbd188
Author: Jasmine Amohia <jasmineamohia.student at wegc.school.nz>
Date: Wed Jan 16 00:54:52 2019 +0000
Bug 22138: updated tab names on members/paycollect.pl
Test plan:
1. Give patron outstanding fees
2. Search patron and select 'Make payment'
3. Select either 'Pay' or 'Write off'
4. Confirm that first tab title remains as 'Transactions'
5. Confirm that current tab title remains as 'Make a payment'
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 590aa0ddd9c9d9cd0d2ab1d50380e9714baf432a
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Jan 28 12:51:02 2019 +0000
Bug 21573: Compiled CSS
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7dbf36e83f81371588aeb60a61e5619e9ca9c7f2
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Oct 15 15:10:28 2018 +0000
Bug 21573: Move lists barcode and biblionumber entry form to modal
This patch modifies the staff client lists page so that the
barcode/biblionumber entry form from the left hand sidebar into a modal
window, triggered by a button in the toolbar.
To test, apply the patch and rebuild the staff client CSS
(https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client).
- View the contents of a list in the staff client, logged in as a user
who has permission to add items.
- Click the "Add items" button. A modal window should appear with the
barcode/biblionumber entry form.
- Submit barcodes and/or biblionumbers and confirm that the correct
titles are added to the list.
- Log in again as a user who does not have permission to add to the
list. Confirm that the button isn't present.
Signed-off-by: Mackey Johnstone <mackeyfj at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit be7592894fc1bdd45406dcfd0a4350fd55596201
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Jan 10 20:40:02 2019 +0000
Bug 17353: (follow-up) Adjust config variable for moremember.tt too
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit f6599b2c5480d2e096bac71e4e7ac759686b9fbc
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Sep 26 17:43:20 2016 +0000
Bug 17353: Add phone number column to checkout search
This patch adds borrowers.phone as 'Primary phone' in the checkout
search results. It also ads the table to columns configuration
To test:
1 - Perform a checkout search
2 - Note phone is not displayed
3 - Apply patch
4 - Note phone does not display
5 - Visit columns configuration
6 - Unhide the 'phone' column
7 - Note phone displays
8 - Ensure page functions as before patch
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 809d5bfbfe95e5a4797898b2381788546cb3a804
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Jan 28 12:36:22 2019 +0000
Bug 20729: Compiled CSS
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit de52519422f5488ca9697050a44994f04aa41cc7
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Oct 10 18:16:10 2018 +0000
Bug 20729: Update style of datepickers
This patch updates the styling of form fields which are configured to
use the jQueryUI datepicker widget. Some CSS has been added, and the
default datepicker configuration has been changed.
To test, apply the patch, rebuild the staff client CSS file, and clear
your cache if necessary. Test pages which include a datepicker to
confirm that they look correct and work correctly. Some examples:
- Circulation -> Check out -> Specify due date
- Patrons -> Add patron -> Date of birth, registration date, expiry
date fields
- Serials -> Search subscriptions -> Search results page sidebar
- Tools -> News -> Add news item
And confirm that this change hasn't adversely affected the calendar
tool:
- Tools -> Calendar
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit d2ac9d9df825f029d7e6010ab1928d0f547c1aeb
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Nov 27 19:25:09 2018 +0000
Bug 21399: Sort patron fines in OPAC by date descending as a default
This patch modifies the DataTables configuration of the logged-in user's
"Fines and charges" table in the OPAC so that the table is sorted by
date, descending.
To test, apply the patch and log in to the OPAC as a user with multiple
fines. Go to the "your fines" page and confirm that the table is sorted
by default on the first column with the newest entries first.
Signed-off-by: Nazlı Çetin <nazli at devinim.com.tr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 1169b729ef43fe5109301d2793f8d94e10eaf245
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Oct 24 16:09:12 2018 +0000
Bug 21913: Clean up payment details page
This patch makes various corrections and improvements to the payment
details page:
- Grid converted to Bootstrap
- Correct title tag
- Add patron toolbar
- Adding missing patron-related JavaScript
- Improve some language
To test, apply the patch and locate a patron who has one or more
payments on their account.
- Open Fines -> Account -> Details of a transaction
- Confirm that the page looks correct and adjusts well at various
browser widths.
- Confirm that patron toolbar items work correctly
Signed-off-by: Jose-Mario <jose-mario.monteiro-santos at inLibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 3ee95bd0213943b625ea5a35eb04e45835cf6f65
Author: Caroline Cyr La Rose <caroline.cyr-la-rose at inlibro.com>
Date: Tue Jan 8 09:28:35 2019 -0500
Bug 22083: Typo in circulation_batch_checkouts.tt
There is a typo in circulation_batch_checkouts.tt that makes Koha skip
a warning if the user cannot borrow due to circulation rules.
This patch corrects this typo.
To test:
1. In Administration > Global system preferences, 'Allow'
BatchCheckouts and enter patron categories in
BatchCheckoutsValidCategories
2. Go to Administration > Circulation and fines rules
3. Enter a rule where a certain category of patrons (that is in
BatchCheckoutsValidCategories) cannot take out a particular item type
4. Search the catalog for an item of that item type
5. Copy the barcode
6. Go into patrons and find a patron of that category
7. Click on the Batch checkout tab
8. Paste the barcode in the box and click Check out
9. It should say 'Too many checked out'
10. Apply the patch
11. Try the check out again, it should show both warnings ('Too many
checked out' and 'This patron can't check out this item per library
circulation policy')
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit fe8c269509f122e0bda48e0d1ac28be2d04dfa01
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Jan 11 16:12:24 2019 +0000
Bug 20640: (follow-up) Always send a backend on migrate
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 85432a1f4cc7d4bcb9e2533ff0c56416dae150a1
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Jan 11 14:50:47 2019 +0000
Bug 20640: (follow-up) Make error message translatable
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 14d6a10de992db89b4730c37fc0d0b86f7467378
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Jan 11 12:41:29 2019 +0000
Bug 20640: (follow-up) Redirect to new request at completion
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit cdf0d7640f379d67231c183a1fe9d3a6497871bc
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Nov 1 15:29:08 2018 +0000
Bug 20640: (follow-up) Degrade gracefully on error
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit bf48a24277bb65b348a55c2c9214d97b570329c2
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Apr 27 08:48:53 2018 +0100
Bug 20640: Add backend migration support to ILL
- Add core methods required to support the migration of ILL requests
between backends.
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit e7b26fcdf05656f45d3741b9607d616f42d56f70
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Tue Sep 18 13:05:26 2018 +0000
Bug 19945: Use CanItemBeReserved in ILSDI HoldItem instead of CanBookBeReserved.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 77a99065462b802f7931b21a8e2a6e0a755ad6eb
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Tue Sep 18 12:59:26 2018 +0000
Bug 19945: Add a test proving that using CanBookBeReserved in ILSDI::HoldItem is wrong.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit abf19383ed3c1e594b75df4cdaf24d6505128a12
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Tue Mar 27 19:31:36 2018 +0000
Bug 19945: (follow-up) optimization and test correction
The double call to CanItemBeReserved was pointless in
the C4/Reserves.pm HoldItem, as CanBookBeReserved calls
CanItemBeReserved and even returns that code.
Additionally, the tests failed, because there were 5
tests not 4.
TEST PLAN
----------
prove t/db_dependent/ILSDI_Services.t
run koha qa test tools
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ac840a846011f8f6f24686ef68f73e7b59f9704e
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Wed Jan 10 15:31:54 2018 +0000
Bug 19945: ILSDI - Return the reason a reserve is impossible
Currently, the ILDSI services HoldTitle and HoldItem always return a
"NotHoldable" code is the reserve is impossible. We need to know why
Test plan:
- Apply this patch
- Place a hold on a non reservable title using ILS-DI web service
(http://koha-opac.example.org/cgi-bin/koha/ilsdi.pl?service=HoldTitle&patron_id=1&bib_id=1&request_location=)
- you should get the reason instead of NotHoldable,
- Place a hold on a non reservable item using ILS-DI web service
(http://koha-opac.example.org/cgi-bin/koha/ilsdi.pl?service=HoldItem&patron_id=1&bib_id=1&item_id=1)
- you should get the reason instead of NotHoldable,
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 094a1cb0703b22d18c061cdc4879c1fc3c76ea80
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Jan 7 14:06:01 2019 -0300
Bug 22066: Record library_id for manual credits
On creating manual credits, the (newly introduced) branchcode should be
set now. This trivial patch makes it work.
To test:
- Create a manual credit for a known patron
- Using MySQL check the result:
$ sudo mysql
> SELECT * FROM accountlines WHERE borrowernumber=<known_id>;
=> FAIL: The created accountline row has NULL for the branchcode
- Apply this patch
- Create a manual credit for the patron
- Run:
> SELECT * FROM accountlines WHERE borrowernumber=<known_id>;
=> SUCCESS: branchcode is set correctly
-Sign off :-D
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 63f897c06eb96f75d26e0d43a9ca0251919c641d
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Jan 28 11:45:49 2019 +0000
Bug 21241: DBRev 18.12.00.009
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 89d4b5ea58f2029f13f4cfa2a652fd4cf900faa9
Author: Alex Buckley <alexbuckley at catalyst.net.nz>
Date: Mon Dec 24 21:38:24 2018 +0000
Bug 21241: (follow-up) Made SQL change idempotent
Also added the new pref to sysprefs.sql
Also simplified the conditional statement.
Sponsored-By: Brimbank Library, Australia
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit a4b38a18b33c6551629af5261980bbaf0a4059b6
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed Nov 7 11:35:36 2018 +0000
Bug 21241: (follow-up) Code Golf
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 3f7b2fa41898f59ce39d1725f8dfe6001095f796
Author: Alex Buckley <alexbuckley at catalyst.net.nz>
Date: Wed Oct 31 13:52:29 2018 +0000
Bug 21241: (follow-up) Syspref to control fallback to SMS when no email is defined
This patch adds a new system preference (FallbackToSMSIfNoEmail)
which if enabled Koha will send suggestion notices by SMS if a borrower
has a defined SMSalertnumber and no email.
The use of the syspref prevents automatic fallback to sending suggestion notices as SMS when there's no defined email.
Test plan:
1. Chose a patron who has no email address set, but does have a
smsalertnumber set (this value is set in the Patron messaging
preferences section after the SMSSendDriver syspref is set)
2. Log into the OPAC with that user and submit a suggestion
3. In the staff client go to Acquisitions->Suggestions and tick the
suggestion and set its status to 'Accepted'
4. In the database query the message_queue and notice the
message_transport_type of the message is set to 'email' even though the
patron has no email address set.
5. Apply patches, restart memcached and plack
6. Check the 'FallbackToSMSIfNoEmail' syspref
is disabled
7. Repeat steps 2,3 and observe in the message_queue
table the message_transport_type = 'email'
i.e. If the syspref is disabled then the message is still sent by email
to borrowers with defined smsalertnumber and no email address
8. Enable the 'FallbackToSMSIfNoEmail' syspref
and repeat steps 2,3 and notice the
message_transport_type = 'sms'
i.e. If the syspref is enabled then the message is sent by sms to
borrowers with defined smsalertnumber and no email address
9. Repeat steps 2,3 with a patron with an email
address and no smsalertnumber trying with the 'FallbackToSMSIfNoEmail' syspref
enabled and disabled and notice in both cases the
message_transport_type = email.
i.e. If a borrower has an email address defined the suggestion
notice will always be sent via email
10. Repeat steps 2,3 with a patron with no email or smsalertnumber trying with the 'FallbackToSMSIfNoEmail' syspref enabled and disabled and notice in both cases the message_transport_type = email
i.e. If the borrower has no smsalertnumber and no email defined then the
suggestion notice will be sent by 'email'
11. Run t/db_dependent/Suggestions.t
Sponsored-By: Brimbank Libraries, Australia
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Bug 21241: (follow-up) Renamed system preference
Sponsored-By: Brimbank Library, Australia
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit dfa883bbd00af6c86397d34f3c202e4d9d20d5bf
Author: Alex Buckley <alexbuckley at catalyst.net.nz>
Date: Fri Aug 17 02:06:56 2018 +1200
Bug 21241: Conditional to choose appropriate message_transport_type for suggestion notices
Introducing a conditional into C4/Suggestions.pm to check if no patron
email exists but a smsalertnumber does exist then the suggestion notice
message_transport_type is set to 'sms', otherwise the suggestion
message_transport_type='email'.
This ensures patrons with no email address still receieve their
suggestion notices because at present the message_transport_type is
hardcoded to 'email'.
Test plan:
1. Chose a patron who has no email address set, but does have a
smsalertnumber set (this value is set in the Patron messaging
preferences section after the SMSSendDriver syspref is set)
2. Log into the OPAC with that user and submit a suggestion
3. In the staff client go to Acquisitions->Suggestions and tick the
suggestion and set its status to 'Accepted'
4. In the database query the message_queue and notice the
message_transport_type of the message is set to 'email' even though the
patron has no email address set.
5. Apply this patch, restart memcached and plack
6. Repeat steps 2,3 with the same patron and query the message_queue
table again and notice this time the message_transport_type = 'sms'
7. Repeat steps 2,3 with a patron with no smsalertnumber or email
address. Query the database and observe the
message_transport_type=email.
If no smsalertnumber is set then the message_transport_type is set to
'email' by default
Sponsored-By: Brimbank Library, Australia
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 358adce2e75bdd317165c86a9b5064bc52d9e2ad
Author: Lucas Gass <lucas at bywatersolutions.com>
Date: Fri Jan 25 15:37:21 2019 +0000
Bug 22207: course reserves page does not have unique <body> id
Test plan: Go to cgi-bin/koha/opac-course-reserves.pl in the OPAC and
make sure the body id is opac-course-reserves
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Mikaël Olangcay Brisebois <mikael.olangcay-brisebois at inLibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit d58a477c56d33df586b60ba9d8ffccf719750468
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Jan 28 11:37:47 2019 +0000
Bug 21089: Compiled CSS
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 5c547ffff2ca04a87695a57e972171cd76cc828c
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Jan 7 13:48:55 2019 +0000
Bug 21089: Overlapping elements in ordering information on acqui/supplier.pl
This patch changes the HTML structure of the vendor edit page so that
the markup is a little simpler. CSS is modified to match. This structure
should serve as a model for other similar form structures:
<fieldset class="rows">
<ol>
<li>
<label>General label:</label>
<label class="radio">
Specific label 1 <input type="radio" />
</label>
<label class="radio">
Specific label 2 <input type="radio" />
</label>
</li>
</ol>
</fieldset>
To test, apply the patch and regenerate the staff client CSS.
- Go to Acquisitions -> Vendor search -> Vendor -> Edit vendor
- In the "Ordering information" section, confirm that the position of
radio buttons looks correct.
- Confirm that radio button labels work correctly.
- Confirm that the adjacent dropdown menus work well.
Signed-off-by: David Cook <dcook at prosentient.com.au>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 1d5934cae52dd96d9c5b8685a5f5531c69e92df8
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Jan 25 13:49:37 2019 -0300
Bug 21478: Make Koha::Hold->suspend reject found holds
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 92db2e74fd3cd761ae67d2f7573ee03d32d0a8ed
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Jan 25 13:48:54 2019 -0300
Bug 21478: Unit tests
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 11ce911915a237047d8168876849de3df2b3b2e0
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Jan 25 12:48:04 2019 -0300
Bug 21478: Add Koha::Exceptions::Hold
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 5b4cbb1643aa20ada17c3f73df3e59dfc5a3dbd8
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Jan 28 11:32:55 2019 +0000
Bug 21877: (RM follow-up) Move space into conditional
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 36df53ad8d4987e938e478d934d553b73e7450f2
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Tue Jan 22 09:45:02 2019 +0100
Bug 21877: Use AuthorisedValues.GetDescriptionByKohaField for notforloan in checkout
Using only TT plugin for authorised value description is a better code.
Test plan :
Part 1:
1.1) On a catalog with items.notforloan defined with authorized values category NOT_LOAN
1.2) Define in NOT_LOAN an authorized values 1 with description 'at the beach'
1.3) Define in NOT_LOAN an authorized values 2 with description empty
Part 2:
2.1) Set preference 'AllowNotForLoanOverride' to 'Don't allow'
2.2) Edit an item with notforloan=1
2.3) Checkout this item => You see 'Item not for loan (at the beach)'
2.4) Edit an item with notforloan=2
2.5) Checkout this item => You see 'Item not for loan'
Part 3:
3.1) Set preference 'AllowNotForLoanOverride' to 'Allow'
3.2) Edit an item with notforloan=1
3.3) Checkout this item => You see 'Item is normally not for loan (at the beach)'
3.4) Edit an item with notforloan=2
3.5) Checkout this item => You see 'Item is normally not for loan'
Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit cfd59672bb09c4766632de4c6f11cf9cf4bea3f9
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Tue Jan 22 09:47:22 2019 +0100
Bug 21877: Show authorized value description for withdrawn in checkout
During checkout the withdrawn information is displayed in a message :
"Item has been withdrawn".
Like in other pages and like notforloan, we should display the withdrawn authorized value description.
This patch adds this display.
Add <span> so that translation does not change.
Also adds class 'co-withdrawn' (like in checkin 'ci-*' classes) to ease hidding this new information via CSS.
Test plan :
1) On a catalog with items.withdrawn defined with authorized values category WITHDRAWN
2) Define in WITHDRAWN an authorized values 1 with description 'dropped in trash'
3) Define in WITHDRAWN an authorized values 2 with description empty
4) Edit an item with withdrawn=1
5) Checkout this item => You see 'Item has been withdrawn (dropped in trash)'
6) Edit an item with withdrawn=2
7) Checkout this item => You see 'Item has been withdrawn'
Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 258c538e76914e6c2023242b555bb38c6f1970b9
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Jan 24 14:57:46 2019 +0000
Bug 22203: Holds modal does not link to patorn account
To test:
1 - Place a hold for a patron
2 - Check the item in at the pickup location
3 - Note the holds modal does not link to patron
4 - Apply patch
5 - Check in item again
6 - Patron name in modal is a link
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 5ab46bc24573165e540a1a287ea3438637c938e3
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Jan 14 14:17:23 2019 +0000
Bug 21989: JS error in "Add orders from MARC file" - addorderiso2709.pl
This patch undoes the changes to addorderiso2709.tt introduced by Bug
19753. The item information tab can include embedded JavaScript for
cataloging plugins, and these don't currently work with JS in the
footer.
To test, apply the patch and test the JavaScript driven features of the
"Add to basket from a staged file" page:
- Acquisitions -> Vendor -> Basket -> Add to basket from a staged file
- MARC and Card previews, select all/clear all
- Item information tab: Cataloging plugins for fields like date
acquired, barcode
- Default accounting details tab: Show inactive control
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/ILSDI/Services.pm | 8 +-
C4/Suggestions.pm | 5 +-
C4/Utils/DataTables/Members.pm | 2 +-
Koha.pm | 2 +-
Koha/Exceptions/Hold.pm | 69 ++++++++
Koha/Hold.pm | 24 ++-
Koha/Illrequest.pm | 17 ++
admin/columns_settings.yml | 19 +-
circ/circulation.pl | 4 +-
ill/ill-requests.pl | 56 +++++-
installer/data/mysql/sysprefs.sql | 1 +
installer/data/mysql/updatedatabase.pl | 9 +
.../intranet-tmpl/prog/css/src/staff-global.scss | 25 +++
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +-
.../intranet-tmpl/prog/en/includes/calendar.inc | 8 +-
.../en/includes/circ-patron-search-results.inc | 2 +
.../intranet-tmpl/prog/en/includes/permissions.inc | 2 +-
.../prog/en/includes/virtualshelves-toolbar.inc | 8 +
.../prog/en/modules/acqui/addorderiso2709.tt | 182 ++++++++++----------
.../prog/en/modules/acqui/supplier.tt | 110 +++++++-----
.../prog/en/modules/admin/preferences/patrons.pref | 10 +-
.../prog/en/modules/circ/circulation.tt | 17 +-
.../en/modules/circ/circulation_batch_checkouts.tt | 2 +-
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 4 +-
.../prog/en/modules/ill/ill-requests.tt | 37 +++-
.../prog/en/modules/members/accountline-details.tt | 148 +++++++++-------
.../prog/en/modules/members/moremember.tt | 2 +-
.../prog/en/modules/members/paycollect.tt | 4 +-
.../prog/en/modules/virtualshelves/shelves.tt | 85 ++++-----
koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 2 +-
.../prog/js/circ-patron-search-results.js | 14 +-
.../opac-tmpl/bootstrap/en/modules/opac-account.tt | 3 +-
.../bootstrap/en/modules/opac-course-reserves.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 2 -
members/mancredit.pl | 3 +
t/Koha/Exceptions.t | 23 ++-
t/db_dependent/Hold.t | 105 ++++++++++-
t/db_dependent/ILSDI_Services.t | 137 +++++++++++++--
t/db_dependent/Suggestions.t | 74 ++++++--
39 files changed, 895 insertions(+), 334 deletions(-)
create mode 100644 Koha/Exceptions/Hold.pm
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list