From gitmaster at git.koha-community.org Wed Nov 1 17:19:48 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 01 Nov 2017 16:19:48 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-1018-gaa42697 Message-ID: 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 aa4269777c5893a3f5ecdec65877c2cec88e3ba3 (commit) via bc0012de2eda1b9f077459df757fd82ea07ca343 (commit) via bdce98487884152549d5aee9e7fb684d54f82d06 (commit) via 8c510e1a92a4ed76de69748bbda91a33b5edd3cf (commit) via 7703723508195ca116e2ea7d766ff741149d2efc (commit) via 411d0cf8ead451099704237549a899bb216aece3 (commit) via 264f69651091350d588a2fa8f2ff05f006126096 (commit) via 844dc871ffc0c664e22be6b14a99a3016580646d (commit) via 1577937057cfeb11419e8c744bf5eaa22cbe5a16 (commit) via e7835ff9780a011476f5cd2438205619f91508b1 (commit) via 84020230ebee553bccf4bfd895719806a7d211f5 (commit) via 63b7017bd36c80a80fb6e66edf8ee538e1bb38ed (commit) via 888a97f15b3c1c6f89311c726793c6cab14850b4 (commit) via 211dafc6505bbaa9bf6bbc4704937e4c7fed4fa2 (commit) via f0e737f43a8eec253e81ad06a8be24730fcf61fd (commit) via dfcb2b8071582a55e35c47926d4b5c1b8b2a9a59 (commit) from 790150b31277e6ded86823add0385c5960a4876e (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 aa4269777c5893a3f5ecdec65877c2cec88e3ba3 Author: Marcel de Rooy Date: Fri Oct 27 07:49:51 2017 +0200 Bug 17989: (QA follow-up) Replace bad dots in SuggestionEngine_ExplodedTerms.t SuggestionEngine_ExplodedTerms.t uses paths like /../.. or /.. in order to find a template in opac-tmpl. Sub badtemplatecheck does not like these paths. Using Cwd::abs_path to resolve the situation (rel2abs does not). Test plan: Run again t/db_dependent/SuggestionEngine_ExplodedTerms.t Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit bc0012de2eda1b9f077459df757fd82ea07ca343 Author: Marcel de Rooy Date: Wed Jan 25 15:32:01 2017 +0100 Bug 17989: Final changes [1] The template sco/printslip.tt is in the regular modules directory. Should not be prefixed with a slash. Test plan: [1] Try to find another occurrence just like the one corrected in sco/printslip.pl where an absolute path is passed to gettemplate or get_template_and_user. I already tried several regex variations while git grepping template_name, but you may still find one.. Signed-off-by: Marcel de Rooy Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens Signed-off-by: Marcel de Rooy Amended: Removed the changes for svc/members/search. Not needed. Commit message adjusted accordingly. Signed-off-by: Jonathan Druart commit bdce98487884152549d5aee9e7fb684d54f82d06 Author: Marcel de Rooy Date: Wed Jul 26 13:14:13 2017 +0200 Bug 17989: Resolve "verbatim paragraph in NAME section" warning in C4::Templates *** WARNING: Verbatim paragraph in NAME section at line 28 in file C4/Templates.pm Test plan: Run podchecker on C4::Templates and verify that the warning is resolved. Signed-off-by: Marcel de Rooy Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 8c510e1a92a4ed76de69748bbda91a33b5edd3cf Author: Marcel de Rooy Date: Wed Jan 25 10:22:13 2017 +0100 Bug 17989: Include full path logic in _get_template_file Similar to the full path test in sub themelanguage, this patch makes a change in _get_template_file. This allows you to pass a template outside the modules directory to get_template_and_user. (Note: the sub badtemplatecheck already blocks bad paths.) Especially, this would be helpful for plugins using templates. As can be seen in Templates.pm, a change was made earlier to overwrite the filename for a plugin in sub gettemplate. This exception can now be removed. Also note the small change in Koha/Plugin/Base.pm; mbf_path is already absolute and if we pass a full path, we do not need it. This allows use of a regular Koha template or a shared template between plugins (as long as badtemplatecheck allows the path). What are the side-effects of this change? [1] We should not pass absolute paths if we mean relative ones. A follow-up patch deals with one occurrence in the codebase. No regressions for regular use. [2] Plugins can call get_template_and_user directly or go via get_template in Koha/Plugin/Base (absolute paths don't go via mbf_path). Note: replaced two single quotes in Auth.pm to show template name in test description. Test plan: [1] Open some page on OPAC or staff client to trigger a template. [2] Run t/db_dependent/Auth.t to verify not allowing some bad templates. [3] Run t/db_dependent/Templates.t to verify an absolute path. [4] Run t/db_dependent/Plugins.t to verify using templates in a plugin. Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 7703723508195ca116e2ea7d766ff741149d2efc Author: Marcel de Rooy Date: Mon Jan 30 09:24:22 2017 +0100 Bug 17989: Extend bad template check The check is now extended by only allowing templates from the regular Koha template directories and additional plugin directories as defined in koha-conf.xml. Note: In order to prevent an uninitialized warning on $theme from sub themelanguage for a not-existing file, I added a trivial assignment. Will get further attention in a follow-up. Test plan: [1] Run t/db_dependent/Auth.t [2] Run t/db_dependent/Templates.t Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 411d0cf8ead451099704237549a899bb216aece3 Author: Marcel de Rooy Date: Mon Jan 30 08:43:45 2017 +0100 Bug 17989: Centralize bad template check The bad template check in get_template_and_user can be removed, since this check has been added in gettemplate on bug 18010. The check moves here to a new sub in C4::Templates. And will be extended in a follow-up. Removed unused variable $path in gettemplatefile. Test plan: [1] Run t/db_dependent/Auth.t (get_template_and_user bad calls). [2] Run t/db_dependent/Templates.t (bad call to gettemplate). Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 264f69651091350d588a2fa8f2ff05f006126096 Author: Jonathan Druart Date: Tue Oct 31 13:25:13 2017 -0300 Bug 7143: Update 'Koha development team' list Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 844dc871ffc0c664e22be6b14a99a3016580646d Author: Jonathan Druart Date: Tue Oct 31 13:09:47 2017 -0300 Bug 7143: Make about.pl knows about the new epoch column Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 1577937057cfeb11419e8c744bf5eaa22cbe5a16 Author: Jonathan Druart Date: Tue Oct 31 12:53:12 2017 -0300 Bug 7143: Add missing entries Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit e7835ff9780a011476f5cd2438205619f91508b1 Author: Jonathan Druart Date: Tue Oct 31 11:19:09 2017 -0300 Bug 7143: Add a new "Epoch" column to the history.txt To allow sort easily. It also fix a few typo and remove 1 duplicated line Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 84020230ebee553bccf4bfd895719806a7d211f5 Author: Jonathan Druart Date: Mon Oct 30 11:14:53 2017 -0300 Bug 19539: (follow-up) Fix column index shift in cirulation rules Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart commit 63b7017bd36c80a80fb6e66edf8ee538e1bb38ed Author: Tomas Cohen Arazi Date: Fri Oct 27 11:12:57 2017 -0300 Bug 19539: Fix column index shift in cirulation rules This patch fixes an index shift introduced by bug 18857 when it introduced a new column. To test: - On the Circulation and fine rules page - Empty the value of 'Current on-site checkouts allowed' and save - Notice 'Unlimited' shows on the saved rule. - Click edit => FAIL: the 'Unlimited' string displays instead of the empty string on the editing row. - Apply this patch - Re-open the circ rules page - Click edit => SUCCESS: An empty string fills the 'Unlimited' fields - Sign off :-D Signed-off-by: David Bourgault Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart commit 888a97f15b3c1c6f89311c726793c6cab14850b4 Author: Julian Maurice Date: Mon Oct 30 14:41:47 2017 +0000 Bug 19176: Fix how t::lib::Dates::compare handle timezone Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart commit 211dafc6505bbaa9bf6bbc4704937e4c7fed4fa2 Author: Josef Moravec Date: Mon Oct 23 22:29:24 2017 +0000 Bug 19176: followup - fix POD in t/lib/Dates.pm Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart commit f0e737f43a8eec253e81ad06a8be24730fcf61fd Author: Jonathan Druart Date: Mon Oct 23 11:38:58 2017 -0300 Bug 19176: Reduce the number of seconds to 5 Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart commit dfcb2b8071582a55e35c47926d4b5c1b8b2a9a59 Author: Jonathan Druart Date: Fri Aug 25 17:56:52 2017 -0300 Bug 19176: Compare the number of seconds when comparing dates in tests # Failed test 'borrowers.updated_on should have been set to now on creating' # at t/db_dependent/Patrons.t line 74. # got: '2017-08-10T20:53:03' # expected: '2017-08-10T20:53:04' # Looks like you failed 1 test of 17. [20:53:15] t/db_dependent/Patrons.t ..................................... The plan here is to compare the number of seconds between two dates. If < 60 the dates are consired as identicals. Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: C4/Auth.pm | 6 +- C4/Templates.pm | 45 +- Koha/Exceptions.pm | 4 + Koha/Plugins/Base.pm | 7 +- about.pl | 2 +- docs/history.txt | 1872 ++++++++++---------- koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 32 +- .../prog/en/modules/admin/smart-rules.tt | 6 +- opac/maintenance.pl | 2 +- opac/sco/printslip.pl | 2 +- t/Test/Dates.t | 29 + t/db_dependent/Auth.t | 2 +- t/db_dependent/Patrons.t | 7 +- t/db_dependent/Plugins.t | 27 +- t/db_dependent/SuggestionEngine_ExplodedTerms.t | 3 +- t/db_dependent/Templates.t | 44 +- t/db_dependent/Virtualshelves.t | 9 +- t/lib/Dates.pm | 32 + 18 files changed, 1191 insertions(+), 940 deletions(-) create mode 100644 t/Test/Dates.t create mode 100644 t/lib/Dates.pm hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Nov 3 17:59:03 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 03 Nov 2017 16:59:03 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-1020-gff82c9a Message-ID: 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 ff82c9aadc441f9ca18dcad2e58783e733cdd839 (commit) via a6d709dcc378aed0f00e13dbe590a5e43370b450 (commit) from aa4269777c5893a3f5ecdec65877c2cec88e3ba3 (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 ff82c9aadc441f9ca18dcad2e58783e733cdd839 Author: Jonathan Druart Date: Fri Nov 3 13:50:27 2017 -0300 Bug 19176: (QA follow-up) few cosmetic changes Signed-off-by: Jonathan Druart commit a6d709dcc378aed0f00e13dbe590a5e43370b450 Author: Mark Tompsett Date: Fri Nov 3 09:58:28 2017 -0400 Bug 19576: Remove extra 'use Koha::Biblios' statement Marcel noticed this while QA'ing another bug. TEST PLAN --------- Apply patch and confirm the page still loads and works as expected. Run Koha QA Test tools Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: opac/opac-detail.pl | 1 - t/lib/Dates.pm | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Nov 8 17:52:41 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 08 Nov 2017 16:52:41 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-1036-gecb65de Message-ID: 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 ecb65def5a33e6a40da0a6ddc21a7f28b5b74daa (commit) via 58bc11a7d4e50d1f2ce7b09dbb512f3a576f5a61 (commit) via 6cd88847ae12f461ff134c3ee2a545e59bb7520b (commit) via 4927671b15d6d1f95a84257ef293872e1c0c9665 (commit) via 493df11102953c4115b38248964f19bc18911236 (commit) via 9d701fe12d6011ef6a6d1792fb608b3654f168b3 (commit) via 8db65715fa2c769d4f2166cbb2b9c39352cfdc79 (commit) via 9fd0555ae828972a7268c56a4f5e56a4a681aa2b (commit) via aeacde0ac7e38d0ca92f005fae36355aae740d3d (commit) via 0c9f01f1758fafe3cd8dbe58cf7482df7b30d761 (commit) via b25cb7ab0f3ff892a273d4d8300483afee414fa3 (commit) via dcfe9844ec5fbb95a42e8140a6b7e9310f15df84 (commit) via 77ce1c6b7f8c0f4003df4493d8247d58e8405c86 (commit) via 97c0b5a5dc5b5853e6f52506e104bbf701ec7c8d (commit) via 43ad66fb07d5f96ac725a8f21a1ef67a53c0461d (commit) via 529793d4aeab4def9c93c96011f0806cfdde3bc2 (commit) from ff82c9aadc441f9ca18dcad2e58783e733cdd839 (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 ecb65def5a33e6a40da0a6ddc21a7f28b5b74daa Author: Marcel de Rooy Date: Fri Nov 3 08:50:08 2017 +0100 Bug 18894: (QA follow-up) POD changes Add limit parameter to POD section. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 58bc11a7d4e50d1f2ce7b09dbb512f3a576f5a61 Author: Kyle M Hall Date: Wed Jul 5 10:33:16 2017 -0400 Bug 18894: Add ability to limit the number of messages sent by process_message_queue.pl at a time Having the ability to limit the number of messages sent by process_message_queue.pl on a single run would be very useful for controlling home many messages are sent at a given time. This can help prevent too many messages being sent out at once and getting flagged as a spammer. Test Plan: 1) Apply this patch 2) Generate some number of messages in the message queue 3) Run process_message_queue.pl with the new --limit option, set limit to a number smaller than the number of pending messages 4) After the script has run, check the database and note that only a number of pending messages were sent, and that the remaining amount of pending messages is the original amount less the number specified as the limit Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 6cd88847ae12f461ff134c3ee2a545e59bb7520b Author: Marcel de Rooy Date: Fri Nov 3 08:24:15 2017 +0100 Bug 19537: (QA follow-up) Consistent structures The subfield_loop structure should contain things like: $VAR1 = { 'marc_subfield' => 'v', 'marc_values' => [ 'form' ] }; This patches replaces the list by an array ref to restore consistency, although Template Toolkit does not really care. Both work. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 4927671b15d6d1f95a84257ef293872e1c0c9665 Author: Nick Clemens Date: Fri Oct 27 10:43:03 2017 +0000 Bug 19537: Correct addition of source subfield from authorities To test: 1 - Find or create a subject authority 2 - Define 008/11 as 's' or 'r' 3 - Add 2nd indicator '7' to main heading 4 - Open or create a bibliographic record 5 - Link to the authority created above 6 - Subfield $2 is not set 7 - Apply patch 8 - Repeat linking, subfield $2 should be set Signed-off-by: Josef Moravec Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 493df11102953c4115b38248964f19bc18911236 Author: Jonathan Druart Date: Wed Nov 8 13:33:40 2017 -0300 Bug 18882: DBIC Schema changes Signed-off-by: Jonathan Druart commit 9d701fe12d6011ef6a6d1792fb608b3654f168b3 Author: Jonathan Druart Date: Wed Nov 8 13:31:06 2017 -0300 Bug 18882: DBRev 17.06.000.027 Signed-off-by: Jonathan Druart commit 8db65715fa2c769d4f2166cbb2b9c39352cfdc79 Author: Kyle M Hall Date: Fri Jun 30 10:37:14 2017 -0400 Bug 18882: (QA follow-up) Ensure stats with no or undef location are set to NULL in db Confirm that only NULL or a string are in the location field of the statistics table. Test with two items, one with shelving location set, and one without it set. Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 9fd0555ae828972a7268c56a4f5e56a4a681aa2b Author: Kyle M Hall Date: Thu Jun 29 11:10:18 2017 -0400 Bug 18882: Add location code to statistics table for checkouts and renewals Some libraries wish to track what the current location of items was at the time they were checked out. This will help libraries track which physical locations in the library patrons are more likely to check out a given book from. Test Plan: 1) Apply this patch 2) Run updatedatabase.pl 3) Check out an item that has a location set 4) Renew that item 5) View the checkout and renewal in the statistics table, verify each has the location column populated correctly Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit aeacde0ac7e38d0ca92f005fae36355aae740d3d Author: Marcel de Rooy Date: Mon Nov 6 11:28:46 2017 +0100 Bug 19420: (QA Follow-up) Change in error reporting affects upload.pl The change from the first patch requires a similar change in upload.pl when a few error codes are passed to the template. Signed-off-by: Marcel de Rooy Tested by deleting a temporary file manually and downloading or deleting the file from the upload search results. Signed-off-by: Jonathan Druart commit 0c9f01f1758fafe3cd8dbe58cf7482df7b30d761 Author: Nick Clemens Date: Fri Nov 3 10:33:00 2017 +0000 Bug 19420: (Follow-up) Add errors on other pages Fix error array (add '0' value) Update errors on other places using upload.js Eventually these should all be using the same code in a js file upload.tt already dealt with these errors, but has diff code, made it work with new error syntax Signed-off-by: Marcel de Rooy Amended: Removed the added js comment in upload.tt Signed-off-by: Jonathan Druart commit b25cb7ab0f3ff892a273d4d8300483afee414fa3 Author: Marcel de Rooy Date: Fri Nov 3 10:19:57 2017 +0100 Bug 19420: (QA Follow-up) Fix test, correct POD The test needs the code level in the error hash now. And POD is adjusted accordingly. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit dcfe9844ec5fbb95a42e8140a6b7e9310f15df84 Author: Nick Clemens Date: Thu Oct 19 10:39:23 2017 +0000 Bug 19420: Improve display of errors from failure of uploading file during stage import To test: 1 - sudo chown www-data:www-data /tmp/koha_kohadev_upload/ (or your relevant dir and user) 2 - Attempt to stage a file 3 - Error message is: Upload status: Failed 4 - Apply patch 5 - Repeat upload 6 - Error is now: Failed - Directory is not writeable: /tmp/koha_kohadev_upload 7 - Trigger the other errors if you can and note better responses Signed-off-by: Katrin Fischer Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 77ce1c6b7f8c0f4003df4493d8247d58e8405c86 Author: Jonathan Druart Date: Wed Nov 8 13:28:50 2017 -0300 Bug 10748: DBRev 17.06.000.026 Signed-off-by: Jonathan Druart commit 97c0b5a5dc5b5853e6f52506e104bbf701ec7c8d Author: Marcel de Rooy Date: Mon Nov 6 09:43:02 2017 +0100 Bug 10748: (QA follow-up) Add comment in SIP's do_checkin Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 43ad66fb07d5f96ac725a8f21a1ef67a53c0461d Author: Jonathan Druart Date: Fri Nov 3 13:27:12 2017 -0300 Bug 10748: Add tests Sponsored-by: BULAC - http://www.bulac.fr/ Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 529793d4aeab4def9c93c96011f0806cfdde3bc2 Author: Jonathan Druart Date: Wed Oct 4 20:54:24 2017 -0300 Bug 10748: Add the ability to block return of lost items Mimicking what does BlockReturnOfWithdrawnItems we can easily add a new syspref to block return of lost items. This patch adds BlockReturnOfLostItems, if set to 'Block' a item marked as lost cannot be checked in. Test plan: 1/ Set BlockReturnOfLostItems to 'Do not block' 2/ Check an item out to a patron 3/ Edit the item and mark it as lost (*) 4/ Check the item in => The item is checked in 5/ Edit the item and remove the lost status 6/ Check the item out again 7/ Edit the item and mark it as lost (*) 8/ Check the item in => The item is not checked in (*) There are 2 ways to mark an item lost: - From the item list view (/catalogue/moredetail.pl?biblionumber=42) If you set the lost status from this form, the issue will be returned Maybe this should be optional (?) - From the edit items form (/cataloguing/additem.pl?biblionumber=42) It is the form you must use to not mark the issue returned. Sponsored-by: BULAC - http://www.bulac.fr/ Signed-off-by: Dominic Pichette Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 12 +++- C4/Letters.pm | 21 +++---- C4/SIP/ILS.pm | 3 + C4/Stats.pm | 27 ++++----- C4/UsageStats.pm | 1 + Koha.pm | 2 +- Koha/Schema/Result/Statistic.pm | 12 +++- Koha/Uploader.pm | 4 +- authorities/blinddetail-biblio-search.pl | 4 +- circ/returns.pl | 2 +- installer/data/mysql/kohastructure.sql | 1 + installer/data/mysql/sysprefs.sql | 1 + installer/data/mysql/updatedatabase.pl | 21 +++++++ .../en/modules/admin/preferences/circulation.pref | 6 ++ .../intranet-tmpl/prog/en/modules/circ/returns.tt | 11 ++-- .../prog/en/modules/offline_circ/process_koc.tt | 6 +- .../prog/en/modules/tools/stage-marc-import.tt | 6 +- .../prog/en/modules/tools/upload-images.tt | 6 +- .../intranet-tmpl/prog/en/modules/tools/upload.tt | 2 +- misc/cronjobs/process_message_queue.pl | 13 ++++- t/db_dependent/Circulation/Returns.t | 31 +++++++++- t/db_dependent/Letters.t | 47 ++++++++++++++- t/db_dependent/Stats.t | 60 +++++++++++++++++--- t/db_dependent/Upload.t | 2 +- t/db_dependent/UsageStats.t | 1 + tools/upload.pl | 6 +- 26 files changed, 246 insertions(+), 62 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Nov 8 18:40:16 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 08 Nov 2017 17:40:16 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-1037-g1415176 Message-ID: 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 14151769028a8d5304de0e18e81cc43ae9164344 (commit) from ecb65def5a33e6a40da0a6ddc21a7f28b5b74daa (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 14151769028a8d5304de0e18e81cc43ae9164344 Author: Jonathan Druart Date: Wed Nov 8 14:34:13 2017 -0300 Bug 18882: (follow-up) DBRev 17.06.000.027 No idea how I did that... Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/updatedatabase.pl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Nov 9 17:38:31 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 09 Nov 2017 16:38:31 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-1067-gff8b030 Message-ID: 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 ff8b030970e6e404a777418043994da3e55c9b7c (commit) via dd88680cbec5d044e604e567cb65bffab091e618 (commit) via 45a87377213e8b487e5bd00063b40a7fe09becb0 (commit) via d02e28af03c6f117e214030973c92e3710309370 (commit) via 007caff1514297151567632c786d01f645d08238 (commit) via d2355111d43672e3ae4dd8ad4d7ec08e8feadf83 (commit) via c9880bd02ae4f90b507736360c15820d9b57293b (commit) via 631294e8aa35b974d84877fd8d73fd9229ca0d36 (commit) via af59238ba0f5585a2eef9dbced28855f3a74032b (commit) via 2725d3156a99d304422119c340f25c89dd7b4e3b (commit) via b1c808b525f7c89fa3442887117734882c1c802e (commit) via af29e710da7ae5368afcb7a2542136f8b3ee2ff8 (commit) via 7d7b0a073d5e9bf48897ed4ade2cff7237df01a0 (commit) via a85ac6b626ea80ba74c114f929b6e4e24b0f7b2d (commit) via f747b10b69386ec7f64749931696b2567c226a9f (commit) via b3de8beed381f6caea4a8160ee23c04c7f156263 (commit) via 3bcb0dc7286acdc978b048defa09ac73cc3f48ea (commit) via 4b79948400f1a02549329fe1329e7c0cab004cd0 (commit) via dd52583363430b75097dbfc923a83d13a007391c (commit) via bfd9af0e58a5f66bc0432949ec60d8d3caab4089 (commit) via 06f9e5fe3aa95be62e40a9a7a85cb0d31b3278d6 (commit) via 66727e6c688f5cc61243c8e789ff82bab5b98fae (commit) via 9fafb8bd947884ebf4893a4102fe3b84bf470ac2 (commit) via 7e3c106b83abb4fc17ff4e559fda04c8b8d37135 (commit) via ba139ec880e06215f6fe1dec9dfa50c8be0d751a (commit) via c99e814a6fd5b9e05deaa0adc4fbe8e37aef58fd (commit) via 81df964bbd0337df0a202cbec2fc96a2cba3ec33 (commit) via 2d971d15b57579c2185397b565cdc33eecdd1020 (commit) via 8e86b5e0935ccec38ec543e36d1b571bb8b23354 (commit) via 4a1ff8534a1ddd54fdd6669ef8f8283af375c0b0 (commit) from 14151769028a8d5304de0e18e81cc43ae9164344 (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 ff8b030970e6e404a777418043994da3e55c9b7c Author: Jonathan Druart Date: Thu Nov 9 12:21:11 2017 -0300 Bug 7317: DBRev 17.06.000.028 Signed-off-by: Jonathan Druart commit dd88680cbec5d044e604e567cb65bffab091e618 Author: Jonathan Druart Date: Thu Nov 9 12:16:59 2017 -0300 Bug 7317: DBIC Schema changes Signed-off-by: Jonathan Druart commit 45a87377213e8b487e5bd00063b40a7fe09becb0 Author: Jonathan Druart Date: Thu Nov 9 13:25:13 2017 -0300 Bug 7317: Display all the libraries, not only one Before this patch only the first library defined in the system where displayed. TODO: Make sure we want to display all the libraries and not a "filtered" list see `git grep PROCESS options_for_libraries libraries|grep unfiltered` Signed-off-by: Jonathan Druart commit d02e28af03c6f117e214030973c92e3710309370 Author: Jonathan Druart Date: Thu Nov 9 13:24:43 2017 -0300 Bug 7317: Make fields mandatory when sending emails Signed-off-by: Jonathan Druart commit 007caff1514297151567632c786d01f645d08238 Author: Jonathan Druart Date: Thu Nov 9 12:50:00 2017 -0300 Bug 7317: Do not use GET for deletion requests Signed-off-by: Jonathan Druart commit d2355111d43672e3ae4dd8ad4d7ec08e8feadf83 Author: Jonathan Druart Date: Thu Nov 9 12:04:29 2017 -0300 Bug 7317: Simplify column headers It will help translators (remove TT tags from po files) and simplify the code. We do not need this translate_column that is used only once. It also removes sorting option on the last column (actions) Signed-off-by: Jonathan Druart commit c9880bd02ae4f90b507736360c15820d9b57293b Author: Tomas Cohen Arazi Date: Thu Nov 9 11:02:46 2017 -0300 Bug 7317: (QA followup) Make query parameters consistent with other endpoints Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 631294e8aa35b974d84877fd8d73fd9229ca0d36 Author: Tomas Cohen Arazi Date: Wed Nov 8 16:37:52 2017 -0300 Bug 7317: Remove traces of UnmediatedILL This patch removes references to UnmediatedILL. This feature is introduced on a separate bug. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit af59238ba0f5585a2eef9dbced28855f3a74032b Author: Tomas Cohen Arazi Date: Wed Nov 8 16:12:35 2017 -0300 Bug 7317: (followup) Remove extra columns from backends on the main list This patch removes the extra columns functionality, simplifying the code. It removes redundant code (in both Perl and JS), unused vars. It removes the use of here_link and hardcodes the script path on the template. It also adjusts the AJAX call so it uses the 'library' param instead of 'branch'. The library column now displays the library name instead of the ID. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 2725d3156a99d304422119c340f25c89dd7b4e3b Author: Tomas Cohen Arazi Date: Wed Nov 8 16:08:01 2017 -0300 Bug 7317: (QA followup) Rename 'branch' for 'library' Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit b1c808b525f7c89fa3442887117734882c1c802e Author: Jonathan Druart Date: Tue Nov 7 17:26:13 2017 -0300 Bug 7317: Fix more translation issues Signed-off-by: Jonathan Druart commit af29e710da7ae5368afcb7a2542136f8b3ee2ff8 Author: Jonathan Druart Date: Tue Nov 7 16:07:31 2017 -0300 Bug 7317: use preventDefault to prevent the scrollbar to move to the top Signed-off-by: Jonathan Druart commit 7d7b0a073d5e9bf48897ed4ade2cff7237df01a0 Author: Jonathan Druart Date: Tue Nov 7 16:52:09 2017 -0300 Bug 7317: Add missing 'use Encode' statement Signed-off-by: Jonathan Druart commit a85ac6b626ea80ba74c114f929b6e4e24b0f7b2d Author: Tomas Cohen Arazi Date: Mon Nov 6 16:15:32 2017 -0300 Bug 7317: (QA followup) Fix capitalization and terminology issues This patch fixed terminology issues on the UI, and removes CSS-based case forcing for column names. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit f747b10b69386ec7f64749931696b2567c226a9f Author: Tomas Cohen Arazi Date: Tue Nov 7 12:05:04 2017 -0300 Bug 7317: Handle missing email addresses gracefuly Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit b3de8beed381f6caea4a8160ee23c04c7f156263 Author: Tomas Cohen Arazi Date: Tue Nov 7 12:04:21 2017 -0300 Bug 7317: (QA followup) ILL sysprefs belong to circulation section Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 3bcb0dc7286acdc978b048defa09ac73cc3f48ea Author: Tomas Cohen Arazi Date: Mon Nov 6 13:51:43 2017 -0300 Bug 7317: (followup) Make tests independent of data on the DB Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 4b79948400f1a02549329fe1329e7c0cab004cd0 Author: Tomas Cohen Arazi Date: Mon Nov 6 12:45:24 2017 -0300 Bug 7317: Add partner_code checks to abot page This patch adds checks to the configured (or fallback) partner_code. It produces two different warnings: - Configured partner_code doesn't match an existing patron category code. - partner_code is not defined, a fallback to ILLLIBS is done Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit dd52583363430b75097dbfc923a83d13a007391c Author: Tomas Cohen Arazi Date: Fri Nov 3 15:28:56 2017 -0300 Bug 7317: opac.css update Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit bfd9af0e58a5f66bc0432949ec60d8d3caab4089 Author: Tomas Cohen Arazi Date: Wed Nov 1 16:29:54 2017 -0300 Bug 7317: (QA followup) Get rid of warnings from the tests Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 06f9e5fe3aa95be62e40a9a7a85cb0d31b3278d6 Author: Tomas Cohen Arazi Date: Tue Oct 31 16:28:53 2017 -0300 Bug 7317: Handle backend absense more gracefuly 5/ This patch makes Koha::Illrequest->load_backend raise an exception if the passed backend is invalid. This way we will catch more errors introduced. The patch also disables the 'New Ill request' when no backends are available. Gets rid of a related warnings. Both OPAC and Intranet now display a warning message when no backends are available. Tests are added for the load_backend changes. 4/ This patch fixes the path for the checkboxes jquery plugin, and removes the include for tablesorter, as this implementation uses Datatables. This is obviously code for older Koha, ported to master. TODO: There's something wrong on the styling. My idea is to get rid of the custom column visualization tool, and have it display as regular DataTables. We can then introduce the use of colvis on a separate bug report. Note: POD coverage for the exceptions file is wrongly tested. It is a false positive. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 66727e6c688f5cc61243c8e789ff82bab5b98fae Author: Magnus Enger Date: Tue Oct 31 12:07:00 2017 +0000 Bug 7317: QA followup This fixes some of the issues reported by the QA script, but not all. Signed-off-by: Jonathan Druart commit 9fafb8bd947884ebf4893a4102fe3b84bf470ac2 Author: Tomas Cohen Arazi Date: Wed Oct 25 15:34:34 2017 -0300 Bug 7317: Rewrite atomicupdate file Signed-off-by: Tomas Cohen Arazi Signed-off-by: Benjamin Rokseth Signed-off-by: Jonathan Druart commit 7e3c106b83abb4fc17ff4e559fda04c8b8d37135 Author: Magnus Enger Date: Wed Oct 25 11:52:26 2017 +0200 Bug 7317: (followup) Fix id and class on body tag The HTML body tag looked like this: Probably an overlooked copypasta. This patch changes it to: This should not have any visual side effects. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Benjamin Rokseth Signed-off-by: Jonathan Druart commit ba139ec880e06215f6fe1dec9dfa50c8be0d751a Author: Tomas Cohen Arazi Date: Tue Oct 24 14:16:02 2017 -0300 Bug 7317: Adjust packages koha-conf.xml Signed-off-by: Tomas Cohen Arazi Signed-off-by: Magnus Enger Original sign off message: It's impossible to give a test plan for this... I have implemented a "plugin" for Norwegian ILL (based on NCIP): https://github.com/Libriotech/koha-illbackend-nncipp Several issues have been discovered while writing the plugin, and Alex has fixed them along the way. Currently I do not know about any funcional issues, and I am happy to sign off. Update: I have applied the new patchset and done some exploratory testing, using the Dummy backend. Everything seems to be fine after the patches were re-arranged and with the followups from Tomas. All tests pass. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Benjamin Rokseth Signed-off-by: Jonathan Druart commit c99e814a6fd5b9e05deaa0adc4fbe8e37aef58fd Author: Tomas Cohen Arazi Date: Mon Oct 23 15:34:01 2017 -0300 Bug 7317: (followup) Migrate endpoint to OpenAPI This patch moves the current endpoint implementation from Swagger2 to the OpenAPI plugin. It also takes advantage of the overloaded Koha::Illrequest::TO_JSON method which has now the option to embed what's needed for the REST api. The path spec is adjusted to fit OpenAPI, and some minor fixes are applied: - Missing 'metadata' query param - 'ill' permissions should be required instead of 'borrowers' - Full test coverage To test: - Apply this patch - Run: $ kshell k$ prove t/db_dependent/api/v1/illrequests.t => SUCCESS: Tests pass! - Sign off :-D Signed-off-by: Tomas Cohen Arazi Signed-off-by: Magnus Enger Signed-off-by: Tomas Cohen Arazi Signed-off-by: Benjamin Rokseth Signed-off-by: Jonathan Druart commit 81df964bbd0337df0a202cbec2fc96a2cba3ec33 Author: Tomas Cohen Arazi Date: Tue Oct 24 13:43:51 2017 -0300 Bug 7317: Overload Koha::Illrequest::TO_JSON This patch implements an overloaded TO_JSON method, that introduces the option to (selectively) embed information required on the REST api. Tests are included for the new method. To test: - Apply this patch - Run: $ kshell k$ prove t/db_dependent/Illrequests.t => SUCCESS: Tests pass! - Sign off :-D Signed-off-by: Tomas Cohen Arazi Signed-off-by: Magnus Enger Signed-off-by: Tomas Cohen Arazi Signed-off-by: Benjamin Rokseth Signed-off-by: Jonathan Druart commit 2d971d15b57579c2185397b565cdc33eecdd1020 Author: Tomas Cohen Arazi Date: Mon Oct 23 15:33:17 2017 -0300 Bug 7317: (QA folowup) 404 if module is disabled (intranet) Signed-off-by: Tomas Cohen Arazi Signed-off-by: Magnus Enger Signed-off-by: Tomas Cohen Arazi Signed-off-by: Benjamin Rokseth Signed-off-by: Jonathan Druart commit 8e86b5e0935ccec38ec543e36d1b571bb8b23354 Author: Alex Sassmannshausen Date: Fri Feb 3 16:58:35 2017 +0100 Bug 7317: Interlibrary loans framework for Koha. This Commit is at the heart of adding an interlibrary loans framework for Koha. The framework does not prescribe a particular workflow. Instead it provides a general framework that can be extended & implemented by individual backends whose responsibility it is to implement a specific workflow. The module is largely self-sufficient: it adds new tables to the Koha database and touches only a few files in the Koha source tree. Primarily, we add our files to the Makefile and the koha-conf.xml, define ill paths for the REST API, and introduce links from the main intranet, opac pages & user permissions. Outside of this we simply add new files & functionality. Signed-off-by: Magnus Enger Signed-off-by: Tomas Cohen Arazi Signed-off-by: Benjamin Rokseth Signed-off-by: Jonathan Druart commit 4a1ff8534a1ddd54fdd6669ef8f8283af375c0b0 Author: Alex Sassmannshausen Date: Thu Sep 22 16:20:14 2016 +0200 Bug 7317: Add SQL templates & sysprefs. * installer/data/mysql/atomicupdate/ill_tables.sql: New file. * installer/data/mysql/kohastructure.sql: Add tables. * installer/data/mysql/sysprefs.sql: Add sysprefs. * installer/data/mysql/userflags.sql: Add userflags. * koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref: Add sysprefs to UI. Signed-off-by: Magnus Enger Signed-off-by: Tomas Cohen Arazi Signed-off-by: Benjamin Rokseth Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- Koha/Exceptions/Ill.pm | 63 ++ Koha/Illrequest.pm | 1047 ++++++++++++++++++++ Koha/Illrequest/Config.pm | 398 ++++++++ Koha/{Account/Offset.pm => Illrequestattribute.pm} | 29 +- Koha/{Items.pm => Illrequestattributes.pm} | 19 +- Koha/Illrequests.pm | 99 ++ Koha/REST/V1/Illrequests.pm | 71 ++ Koha/Schema/Result/Borrower.pm | 19 +- Koha/Schema/Result/Branch.pm | 19 +- Koha/Schema/Result/Illrequest.pm | 239 +++++ Koha/Schema/Result/Illrequestattribute.pm | 97 ++ Makefile.PL | 1 + about.pl | 32 + api/v1/swagger/paths.json | 3 + api/v1/swagger/paths/illrequests.json | 125 +++ debian/templates/koha-conf-site.xml.in | 21 + etc/koha-conf.xml | 21 + ill/ill-requests.pl | 277 ++++++ installer/data/mysql/kohastructure.sql | 49 + installer/data/mysql/sysprefs.sql | 2 + installer/data/mysql/updatedatabase.pl | 69 ++ installer/data/mysql/userflags.sql | 3 +- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 88 ++ .../intranet-tmpl/prog/en/includes/circ-menu.inc | 3 + .../intranet-tmpl/prog/en/includes/ill-toolbar.inc | 30 + .../intranet-tmpl/prog/en/includes/permissions.inc | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 21 +- .../en/modules/admin/preferences/circulation.pref | 13 + .../prog/en/modules/ill/ill-requests.tt | 619 ++++++++++++ .../intranet-tmpl/prog/en/modules/intranet-main.tt | 5 + koha-tmpl/opac-tmpl/bootstrap/css/opac.css | 2 +- .../opac-tmpl/bootstrap/en/includes/usermenu.inc | 9 + .../bootstrap/en/modules/opac-illrequests.tt | 225 +++++ .../bootstrap/en/modules/opac-results-grouped.tt | 23 +- .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 26 +- koha-tmpl/opac-tmpl/bootstrap/less/opac.less | 38 + opac/opac-illrequests.pl | 133 +++ t/db_dependent/Illrequest/Config.t | 471 +++++++++ t/db_dependent/Illrequestattributes.t | 64 ++ t/db_dependent/Illrequests.t | 862 ++++++++++++++++ t/db_dependent/api/v1/illrequests.t | 151 +++ 42 files changed, 5439 insertions(+), 50 deletions(-) create mode 100644 Koha/Exceptions/Ill.pm create mode 100644 Koha/Illrequest.pm create mode 100644 Koha/Illrequest/Config.pm copy Koha/{Account/Offset.pm => Illrequestattribute.pm} (57%) copy Koha/{Items.pm => Illrequestattributes.pm} (75%) create mode 100644 Koha/Illrequests.pm create mode 100644 Koha/REST/V1/Illrequests.pm create mode 100644 Koha/Schema/Result/Illrequest.pm create mode 100644 Koha/Schema/Result/Illrequestattribute.pm create mode 100644 api/v1/swagger/paths/illrequests.json create mode 100755 ill/ill-requests.pl create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt create mode 100755 opac/opac-illrequests.pl create mode 100644 t/db_dependent/Illrequest/Config.t create mode 100644 t/db_dependent/Illrequestattributes.t create mode 100644 t/db_dependent/Illrequests.t create mode 100644 t/db_dependent/api/v1/illrequests.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Nov 9 18:29:53 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 09 Nov 2017 17:29:53 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-1068-gd149f19 Message-ID: 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 d149f1963e3f23f2fc880fa839dadc488428e52a (commit) from ff8b030970e6e404a777418043994da3e55c9b7c (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 d149f1963e3f23f2fc880fa839dadc488428e52a Author: Jonathan Druart Date: Thu Nov 9 14:22:54 2017 -0300 Bug 7317: Fix translatable-templates.t failure Failed with /tmp/Lqv0BH2xC9:7979:13: invalid multibyte sequence msgmerge: found 1 fatal error Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Nov 14 01:31:23 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 14 Nov 2017 00:31:23 +0000 Subject: [koha-commits] main Koha release repository branch 16.05.x updated. v16.05.18-3-g19d6241 Message-ID: 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.05.x has been updated via 19d62411e77edfa7a6f40645a3a20d9e1300b468 (commit) via 8cf6738afde255844d5feb216edbfb3eada51f28 (commit) via 6702eec5e01b422ec61997fb75056386957762be (commit) from 63b7948f648f4d377fbb5e12565e1bae34e422d2 (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 19d62411e77edfa7a6f40645a3a20d9e1300b468 Author: Mason James Date: Tue Nov 14 03:38:19 2017 +1300 Revert "Bug 14637: Fix add patron category under MySQL 5.7 - tests" This reverts commit f75437546fcfbbd931e9577dc428f9c52ed13beb. commit 8cf6738afde255844d5feb216edbfb3eada51f28 Author: Mason James Date: Tue Nov 14 03:38:16 2017 +1300 Revert "Bug 14637: Fix add patron category under MySQL 5.7" This reverts commit 047c31b4246bb5eb0f20238355190f9535dc4721. commit 6702eec5e01b422ec61997fb75056386957762be Author: Mason James Date: Tue Nov 14 03:38:10 2017 +1300 Revert "Bug 14637: Followup - Fix number of tests due to rebase" This reverts commit 783d5ea02e677fe00e8b3f7ad43d801a9a87de38. ----------------------------------------------------------------------- Summary of changes: Koha/Patron/Category.pm | 35 ------------------------------- t/db_dependent/Koha/Patron/Categories.t | 12 +---------- 2 files changed, 1 insertion(+), 46 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Nov 15 23:06:59 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 15 Nov 2017 22:06:59 +0000 Subject: [koha-commits] main Koha release repository branch 16.11.x updated. v16.11.13-38-g82cfc06 Message-ID: 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 82cfc06c68b7250ac0e2679df39c92eecf7230aa (commit) from 389dd63c4e6ded84aba441c0c254537645d7a153 (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 82cfc06c68b7250ac0e2679df39c92eecf7230aa Author: Pongtawat C Date: Wed Jun 28 17:58:24 2017 +0700 Bug 17610 - Allow the number of plack workers and max connections to be set in koha-conf.xml Signed-off-by: Josef Moravec ----------------------------------------------------------------------- Summary of changes: debian/scripts/koha-plack | 7 ++++++- debian/templates/koha-conf-site.xml.in | 4 ++++ etc/koha-conf.xml | 4 ++++ 3 files changed, 14 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Nov 20 14:02:19 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 20 Nov 2017 13:02:19 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.05-75-g17085ea Message-ID: 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, 17.05.x has been updated via 17085ea1cb67b8022cd912d0313fc8b3d48530da (commit) from fc4ee4aeec28c0f99e8432d4ce7748b7f628d85c (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 17085ea1cb67b8022cd912d0313fc8b3d48530da Author: David Kuhn Date: Tue Jun 6 09:38:07 2017 -0700 Bug 18616 - The "Add forgot password link to OPAC" should allow patrons to use their library card number in addition to username Allow patrons to enter either their library card number or user name in the "Log in" box for password recovery. Most patrons at our library use their card number to log in and are unaware of what their userid is. However there are some who have set a customized userid and would prefer to use that. This patch would allow either to be entered for password recovery. To test: 1. Enable the password recovery feature. 2. In the OPAC, click on "Forgot you password?" link and enter a valid library card number. 3. The error message "No account found with the provided information" appears. 4. Apply the patch. 5. Repeat step 2. The recovery email is now sent. Note: Moved patch from 16711 back here and re-tested. Signed-off-by: Marc V?ron Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart (cherry picked from commit e29163af4cde7ce33060716091726e6fa2eef65e) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: opac/opac-password-recovery.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Nov 20 14:15:44 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 20 Nov 2017 13:15:44 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.05-79-g9d3b39e Message-ID: 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, 17.05.x has been updated via 9d3b39e94de837cfc08259ae5778fb0372b662ff (commit) via 49beda21761e57d1d7b389e6a08f3327a53215b0 (commit) via 243009bc9a07f89adbe14a4c8f35df85030f3dab (commit) via 67a3bd6d78eab1bda2d3905a8d842ef0614e0256 (commit) from 17085ea1cb67b8022cd912d0313fc8b3d48530da (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 9d3b39e94de837cfc08259ae5778fb0372b662ff Author: Jonathan Druart Date: Fri Oct 20 15:56:20 2017 -0300 Bug 19487: Refetch the object to get up-to-date values This has been raised by failures on t/db_dependent/Circulation/issue.t (thanks tests!) Signed-off-by: Jonathan Druart (cherry picked from commit 850243ee2ec66a4b569d29ed84423f09c0001690) Signed-off-by: Fridolin Somers commit 49beda21761e57d1d7b389e6a08f3327a53215b0 Author: Jonathan Druart Date: Thu Oct 19 09:02:20 2017 -0300 Bug 19487: Fix MarkIssueReturned.t MarkIssueReturned must now return directly if the issue does not exist. We then check if the anonymous patron configuration is correct. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit 60bb936bc28b73f1653207cce36f432dec094017) Signed-off-by: Fridolin Somers commit 243009bc9a07f89adbe14a4c8f35df85030f3dab Author: Jonathan Druart Date: Wed Oct 18 13:59:56 2017 -0300 Bug 19487: Do not return an item if not checked out To recreate: 1 - Manually add a lost fine to a ptron and include a barcode 2 - Attempt to write off the fine 3 - Internal server error 4 - Checkout an item and mark lost to checkin and fine 5 - Attempt to write off line 6 - Internal server error Signed-off-by: Nick Clemens Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit 7b5c1fce5880f8592c5a9dbd40614a760bb2607e) Signed-off-by: Fridolin Somers commit 67a3bd6d78eab1bda2d3905a8d842ef0614e0256 Author: Kyle M Hall Date: Fri Oct 20 10:49:38 2017 -0400 Bug 19495: Automatic report conversion needs to do global replace on 'biblioitems' and 'marcxml' Bug 17898 provides a way of converting reports that use biblioitems.marcxml so that they will use biblio_metadata.metadata instead. This only works with reports that do not refer to other columns in the biblioitems table. This is a known limitation. It means that we should be able to do a substitution of every occurrence of biblioitems with biblio_metadata, and every occurrence of marcxml with metadata. Unfortunately, we're not doing a global replace, we're only replacing the first occurrence. Test Plan: 1) Apply this patch 2) prove t/db_dependent/Reports/Guided.t All tests successful. Files=1, Tests=9, 10 wallclock secs ( 0.11 usr 0.01 sys + 2.85 cusr 0.25 csys = 3.22 CPU) Result: PASS Signed-off-by: Dominic Pichette Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit d6a1f2ab242474c9e477c2f6d4df5c316a4ef448) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 14 +++++----- C4/Reports/Guided.pm | 4 +-- t/db_dependent/Circulation/MarkIssueReturned.t | 33 +++++++++++++++++++----- t/db_dependent/Reports/Guided.t | 13 +++++++++- 4 files changed, 48 insertions(+), 16 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Nov 20 14:46:05 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 20 Nov 2017 13:46:05 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.05-81-g1f9d132 Message-ID: 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, 17.05.x has been updated via 1f9d132cecc5b7c264b5c80e869c0ecc18a1fc05 (commit) via fa0608bc4c2e66628285f7434749df0a0e690e8b (commit) from 9d3b39e94de837cfc08259ae5778fb0372b662ff (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 1f9d132cecc5b7c264b5c80e869c0ecc18a1fc05 Author: Andreas Roussos Date: Fri Oct 20 22:58:27 2017 +0300 Bug 19503: Duplicating a dropdown menu subfield yields an empty subfield tag While editing a record in the staff client, if you clone a repeatable dropdown subfield the cloned subfield's tag is empty. This can result in data loss if the record is saved, re-opened, and saved yet again. This patch (originally written by Sophie MEYNIEUX for bug 17818) fixes that. Test plan: 0) [PREREQUISITE] In your MARC framework (Home > Administration > MARC bibliographic framework) ensure that you have at least one subfield of a particular tag linked to an authorised value (e.g. in UNIMARC, tag 700 subfield 4 is 'Relator Code' and can be linked to CCODE for testing purposes). This is so that the relevant subfield will be a dropdown menu and not a textbox. 1) In the Staff Client, edit an existing record or create a new one. Then, try to clone any subfield that is a dropdown menu. Observe that the cloned subfield's tag is empty. 2) Apply the patch. 3) Hit CTRL-F5 in your browser (to ensure cataloging.js is re-loaded) and try to clone a dropdown menu subfield again. This time the tag is cloned as well. Working as intended. Signed-off-by: Simon Pouchol Signed-off-by: Kyle M Hall https://bugs.koha-community.org/show_bug.cgi?id=16503 Signed-off-by: Jonathan Druart (cherry picked from commit 4f2d59e67b6d938ca2798fe8b7fc3ec6eda1d253) Signed-off-by: Fridolin Somers commit fa0608bc4c2e66628285f7434749df0a0e690e8b Author: David Cook Date: Tue Oct 10 12:05:16 2017 +1100 Bug 18884: Advanced search on staff client, Availability limit not properly limiting Patch applies and functions as described. Signed-off-by: Dilan Johnpull? Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 48be40d1bfaf13a70b6bf4918e885d9158e25f66) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt | 2 +- koha-tmpl/intranet-tmpl/prog/js/cataloging.js | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Nov 20 22:44:23 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 20 Nov 2017 21:44:23 +0000 Subject: [koha-commits] main Koha release repository branch 16.11.x updated. v16.11.13-43-g0da1c85 Message-ID: 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 0da1c854b58b43dfea40f873a33b1918dd39dc7e (commit) via 69312dd662ed8e36d43f1a935807c74bfb904256 (commit) via 97d7d92234d059df9e3a518ede917041f35afae9 (commit) via 2e2fda1e86852892c2e89e93276a794b81a9a76f (commit) via a1d08a7dfcb141c5fa95badd54a2da7bd47e0f2a (commit) from 82cfc06c68b7250ac0e2679df39c92eecf7230aa (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 0da1c854b58b43dfea40f873a33b1918dd39dc7e Author: David Cook Date: Tue Oct 10 12:05:16 2017 +1100 Bug 18884: Advanced search on staff client, Availability limit not properly limiting Patch applies and functions as described. Signed-off-by: Dilan Johnpull? Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 48be40d1bfaf13a70b6bf4918e885d9158e25f66) Signed-off-by: Fridolin Somers (cherry picked from commit fa0608bc4c2e66628285f7434749df0a0e690e8b) Signed-off-by: Katrin Fischer commit 69312dd662ed8e36d43f1a935807c74bfb904256 Author: Jonathan Druart Date: Fri Oct 20 15:56:20 2017 -0300 Bug 19487: Refetch the object to get up-to-date values This has been raised by failures on t/db_dependent/Circulation/issue.t (thanks tests!) Signed-off-by: Jonathan Druart (cherry picked from commit 850243ee2ec66a4b569d29ed84423f09c0001690) Signed-off-by: Fridolin Somers (cherry picked from commit 9d3b39e94de837cfc08259ae5778fb0372b662ff) Signed-off-by: Katrin Fischer commit 97d7d92234d059df9e3a518ede917041f35afae9 Author: Jonathan Druart Date: Thu Oct 19 09:02:20 2017 -0300 Bug 19487: Fix MarkIssueReturned.t MarkIssueReturned must now return directly if the issue does not exist. We then check if the anonymous patron configuration is correct. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit 60bb936bc28b73f1653207cce36f432dec094017) Signed-off-by: Fridolin Somers (cherry picked from commit 49beda21761e57d1d7b389e6a08f3327a53215b0) Signed-off-by: Katrin Fischer commit 2e2fda1e86852892c2e89e93276a794b81a9a76f Author: Jonathan Druart Date: Wed Oct 18 13:59:56 2017 -0300 Bug 19487: Do not return an item if not checked out To recreate: 1 - Manually add a lost fine to a ptron and include a barcode 2 - Attempt to write off the fine 3 - Internal server error 4 - Checkout an item and mark lost to checkin and fine 5 - Attempt to write off line 6 - Internal server error Signed-off-by: Nick Clemens Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit 7b5c1fce5880f8592c5a9dbd40614a760bb2607e) Signed-off-by: Fridolin Somers (cherry picked from commit 243009bc9a07f89adbe14a4c8f35df85030f3dab) Signed-off-by: Katrin Fischer commit a1d08a7dfcb141c5fa95badd54a2da7bd47e0f2a Author: David Kuhn Date: Tue Jun 6 09:38:07 2017 -0700 Bug 18616 - The "Add forgot password link to OPAC" should allow patrons to use their library card number in addition to username Allow patrons to enter either their library card number or user name in the "Log in" box for password recovery. Most patrons at our library use their card number to log in and are unaware of what their userid is. However there are some who have set a customized userid and would prefer to use that. This patch would allow either to be entered for password recovery. To test: 1. Enable the password recovery feature. 2. In the OPAC, click on "Forgot you password?" link and enter a valid library card number. 3. The error message "No account found with the provided information" appears. 4. Apply the patch. 5. Repeat step 2. The recovery email is now sent. Note: Moved patch from 16711 back here and re-tested. Signed-off-by: Marc V?ron Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart (cherry picked from commit e29163af4cde7ce33060716091726e6fa2eef65e) Signed-off-by: Fridolin Somers (cherry picked from commit 17085ea1cb67b8022cd912d0313fc8b3d48530da) Signed-off-by: Katrin Fischer ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 14 ++++----- .../prog/en/includes/html_helpers.inc | 4 +-- .../prog/en/modules/catalogue/advsearch.tt | 2 +- opac/opac-password-recovery.pl | 4 +-- t/db_dependent/Circulation/MarkIssueReturned.t | 33 ++++++++++++++++---- 5 files changed, 39 insertions(+), 18 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Nov 22 13:52:09 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 22 Nov 2017 12:52:09 +0000 Subject: [koha-commits] main Koha release repository branch 16.05.x updated. v16.05.18-31-gac71de2 Message-ID: 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.05.x has been updated via ac71de28eb8d4fa5fb26125ca72f2a49cc3c4f07 (commit) via 77cc4c104f68f5cdab8dcf7c35d68608bacbdaad (commit) via 6eaf56ec67bdebb49b78ecf9e603b2ef7e95f4d5 (commit) via da3c5866edb19b97a03ce00d8bb452e7bee54a7a (commit) via 53e93ebaa1e1e0ec4675dfbe358375812aefcb37 (commit) via 068063770af7cb29acae2e0d5fb0724dcbf40dcb (commit) via 44d417e61ee1211d785cde53dfae5a08186b05fa (commit) via 055e2db98366c0c6f2f459c9cbba6b0fff57cc94 (commit) via 94b8321740f93a42f1cbe4b278cb60d7583dcde0 (commit) via 1ae6f171dcfcfe3227cedf8b273092c2e1b80cc0 (commit) via a5c23097017df86143ad4b5037801bf362f2c48f (commit) via dfc44a560f5ce473559c2d65068e0334b15c03d1 (commit) via d2aaa2fbc818d866e57cfb79e5e400144a215913 (commit) via 0a31ee40d414fd4936b10e1b40e829c8642133b2 (commit) via 4f4a322cb55afbce3c7ade75c58fba9967cbfa18 (commit) via 30c29ec4ec3cb4c362827d85ca6b8ac565452fe4 (commit) via 7422485616745b0a0728c0c2349b7372e79296ea (commit) via 4e4651ae1b03e10813e7b03d87e30b6d4c1a0960 (commit) via dca9e78990fbb657a688c6f565d57497c27fc4ec (commit) via 775b5b80d0fe453dd2def25ec43011af4e3abf0e (commit) via 3317512b1f3abf42def5bac0e37b7767b68ea4c9 (commit) via 0e009107c40065a5989aa0664402decc4ab89470 (commit) via 83c04340522df7465b321167e28536b5f9800b64 (commit) via 3c96f7ce90920e1b325ed38d52df150a99241e81 (commit) via 05633b3ef8b8dc0189280f746bb7936b701da69b (commit) via 08c105cf0b720bd2c3cbfc97bc2112cea1a5e184 (commit) via 3d11f18ec4d1f4c8e02c405e28daebbdc4603e71 (commit) via d0c7d92334e52aa0df29b8a4f7f8a27cf9a1e33c (commit) from 19d62411e77edfa7a6f40645a3a20d9e1300b468 (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 ac71de28eb8d4fa5fb26125ca72f2a49cc3c4f07 Author: David Kuhn Date: Tue Jun 6 09:38:07 2017 -0700 Bug 18616 - The "Add forgot password link to OPAC" should allow patrons to use their library card number in addition to username Allow patrons to enter either their library card number or user name in the "Log in" box for password recovery. Most patrons at our library use their card number to log in and are unaware of what their userid is. However there are some who have set a customized userid and would prefer to use that. This patch would allow either to be entered for password recovery. To test: 1. Enable the password recovery feature. 2. In the OPAC, click on "Forgot you password?" link and enter a valid library card number. 3. The error message "No account found with the provided information" appears. 4. Apply the patch. 5. Repeat step 2. The recovery email is now sent. Note: Moved patch from 16711 back here and re-tested. Signed-off-by: Marc V?ron Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart (cherry picked from commit e29163af4cde7ce33060716091726e6fa2eef65e) Signed-off-by: Fridolin Somers (cherry picked from commit 17085ea1cb67b8022cd912d0313fc8b3d48530da) Signed-off-by: Katrin Fischer commit 77cc4c104f68f5cdab8dcf7c35d68608bacbdaad Author: Pongtawat C Date: Wed Jun 28 17:58:24 2017 +0700 Bug 17610 - Allow the number of plack workers and max connections to be set in koha-conf.xml Signed-off-by: Josef Moravec Conflicts: debian/templates/koha-conf-site.xml.in commit 6eaf56ec67bdebb49b78ecf9e603b2ef7e95f4d5 Author: Jonathan Druart Date: Fri Oct 6 12:30:18 2017 -0300 Bug 19423: Prevent DecreaseLoanHighHolds.t to fail randomly CanBookBeIssued returns STATS if categorycode is X Signed-off-by: Jonathan Druart (cherry picked from commit 090b450a502340e3d03b5ee6a075cc92e647aada) Signed-off-by: Fridolin Somers (cherry picked from commit fc4ee4aeec28c0f99e8432d4ce7748b7f628d85c) Signed-off-by: Katrin Fischer commit da3c5866edb19b97a03ce00d8bb452e7bee54a7a Author: Nick Clemens Date: Mon Aug 28 16:27:41 2017 +0000 Bug 19193: When displaying the fines of the guarantee on the guarantor account, price is not in correct format 1 - Have a patron with guarantees 2 - Charge some fines to the guarantees 3 - View the patron 4 - Fines are displayed unformatted 5 - Apply patch 6 - Refresh 7 - Fines should now be formatted correctly Signed-off-by: Caroline Cyr La Rose Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit 0d124e1bc322e6823c192c51effa0f3eecb2ac1f) Signed-off-by: Fridolin Somers (cherry picked from commit 448c1206f82c039fa90c8ad480c384a578f39acb) Signed-off-by: Katrin Fischer commit 53e93ebaa1e1e0ec4675dfbe358375812aefcb37 Author: Mark Tompsett Date: Mon Nov 21 12:08:52 2016 -0500 Bug 17664: Silence non-zebra warnings in t/db_dependent/Search.t TEST PLAN --------- 0) back up database 1) drop database; create database 2) run web installer 3) prove t/db_dependent/Search.t -- the spammy warnings (other than zebra index warnings) may already be fixed, but the mocked value was not realistic. 4) apply patch 5) prove t/db_dependent/Search.t -- notice only zebra index warnings. 6) run qa test tools Signed-off-by: Alex Buckley Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit 5e63a3838102ee1fe8a1bc15640196ab611dbc89) Signed-off-by: Fridolin Somers (cherry picked from commit 23c8acd61590de50bcfa2779afc35fb7d5dd6488) Signed-off-by: Katrin Fischer Conflicts: t/db_dependent/Search.t commit 068063770af7cb29acae2e0d5fb0724dcbf40dcb Author: David Bourgault Date: Tue Sep 19 13:37:54 2017 -0400 Bug 19345: Add missing error flag to template Adds a missing error flag to the template->param { } call. Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit 078eb77451dacd6042b783edf6f89f5ab95732b5) Signed-off-by: Fridolin Somers (cherry picked from commit 96143e8d9e62a0565c996d5fd071b7a9d0407019) Signed-off-by: Katrin Fischer commit 44d417e61ee1211d785cde53dfae5a08186b05fa Author: Marcel de Rooy Date: Fri Oct 6 11:39:42 2017 +0200 Bug 19386: [QA Follow-up] Remove some default values In the meantime bug 19403 added default nulls for gonenoaddress, lost and debarred. So these lines can be removed safely. Signed-off-by: Marcel de Rooy Signed-off-by: Mason James commit 055e2db98366c0c6f2f459c9cbba6b0fff57cc94 Author: Jonathan Druart Date: Thu Sep 28 17:31:04 2017 -0300 Bug 19386: Prevent t/db_dependent/SIP/Patron.t to fail randomly Depending on the values used by TestBuilder, some tests from t/db_dependent/SIP/Patron.t can fail # Failed test 'Not blocked without overdues when set to 'Don't block'' # at t/db_dependent/SIP/Patron.t line 55. # got: '0' # expected: '1' # Failed test 'Not blocked without overdues when set to 'confirmation'' # at t/db_dependent/SIP/Patron.t line 61. # got: '0' # expected: '1' # Failed test 'Not blocked without overdues when set to 'Block'' # at t/db_dependent/SIP/Patron.t line 67. # got: '0' # expected: '1' Caused by this check in C4::SIP::ILS::Patron->new 110 for (qw(EXPIRED CHARGES CREDITS GNA LOST DBARRED NOTES)) { 111 ($flags->{$_}) or next; [...] 115 if ($flags->{$_}->{noissues}) { 116 foreach my $toggle (qw(charge_ok renew_ok recall_ok hold_ok inet)) { 117 $ilspatron{$toggle} = 0; # if we get noissues, disable everything 118 } 119 } 120 } Test plan: Execute several times (50x?) these tests. Without this patch they may fail With this patch they must never fail Signed-off-by: David Bourgault Signed-off-by: Marcel de Rooy Signed-off-by: Mason James commit 94b8321740f93a42f1cbe4b278cb60d7583dcde0 Author: Jonathan Druart Date: Tue Oct 3 11:03:43 2017 -0300 Bug 16726: Do not display "You searched for:" if not needed Signed-off-by: Jonathan Druart Signed-off-by: Mason James commit 1ae6f171dcfcfe3227cedf8b273092c2e1b80cc0 Author: Aleisha Amohia Date: Tue Jun 27 04:14:47 2017 +0000 Bug 16726: [FOLLOW-UP] Putting text in h1 Works as outlined in test plan, search terms now appear at top as h1 as well Signed-off-by: Dilan Johnpull? Signed-off-by: Nick Clemens Signed-off-by: Mason James commit a5c23097017df86143ad4b5037801bf362f2c48f Author: Aleisha Amohia Date: Wed Jun 7 02:09:36 2017 +0000 Bug 16726: Clear text in syspref searchbox after submitting To test: 1) Go to Admin -> search for a system preference 2) Notice your search stays in the search box (this is inconsistent with search behaviour across Koha) 3) Apply patch and refresh page 4) Make another search 5) Confirm search still works as expected and search terms have been cleared from search box 6) Confirm search terms show at the top of the results Sponsored-by: Catalyst IT Signed-off-by: Nick Clemens Signed-off-by: Mason James commit dfc44a560f5ce473559c2d65068e0334b15c03d1 Author: Jonathan Druart Date: Fri Sep 29 16:28:13 2017 -0300 Bug 19392: Clean-up behind auth_values_input_www.t The two categories created by this test script are not removed Test plan: without this patch, the two authorised value categories ????? and t?mas are not removed when the script finishes. Now it does! Signed-off-by: Mason James commit d2aaa2fbc818d866e57cfb79e5e400144a215913 Author: Nick Clemens Date: Wed Sep 13 12:06:50 2017 +0000 Bug 19307: Mock the AllowFineOverride preference to ensure expected result To test: 1 - Set 'AllowFineOverride' to allow 2 - prove t/db_dependent/Circulation/NoIssuesChargeGuarantees.t 3 - 1 test fails 4 - Apply patch 5 - prove t/db_dependent/Circulation/NoIssuesChargeGuarantees.t 6 - All tests pass 7 - Set 'AllowFineOverride' to 'Don't allow' 8 - Tests should still pass Signed-off-by: David Bourgault Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart (cherry picked from commit 1e2e1247c9bcd15514dc395be891a9a3607e5ea5) Signed-off-by: Fridolin Somers (cherry picked from commit 86612541a45f6753b0ad87453a62fe8c9ba3047b) Signed-off-by: Katrin Fischer Conflicts: t/db_dependent/Circulation/NoIssuesChargeGuarantees.t commit 0a31ee40d414fd4936b10e1b40e829c8642133b2 Author: Aleisha Amohia Date: Wed Aug 30 23:26:38 2017 +0000 Bug 16463: Replace discharge link with error message if user has checked out items To test: 1) Ensure the useDischarge syspref is enabled 2) Check out an item to a borrower 3) Log in to the OPAC as this borrower 4) Click the 'ask for a discharge' link in the nav 5) Click the 'Ask for a discharge' link 6) Notice you cannot be discharged because you have checkouts 7) Apply the patch, click the 'ask for a discharge' link in the nav 8) Notice the link has been replaced with an appropriate error message 9) Attempt to force the discharge URL: /cgi-bin/koha/opac-discharge?op=request 10) Notice the message and you cannot be discharged. 11) Confirm that when you check in your item, the discharge link shows again and works as expected. Sponsored-by: Catalyst IT Signed-off-by: Caroline Cyr La Rose Signed-off-by: Kyle M Hall Signed-off-by: Mason James commit 4f4a322cb55afbce3c7ade75c58fba9967cbfa18 Author: Jonathan Druart Date: Tue Sep 19 11:57:10 2017 -0300 Bug 19195: Do not explicitely force scalar context when unecessary These ones are already called in scalar context commit 30c29ec4ec3cb4c362827d85ca6b8ac565452fe4 Author: Aleisha Amohia Date: Tue Aug 29 05:02:29 2017 +0000 Bug 19195: Preventing noisy warns when creating or editing a basket To test: 1) Open the koha intranet error log 2) Go to Acquisitions -> Find or create a vendor 3) Create a new basket, filling all fields 4) Notice warns in error log 5) Edit this basket 6) Notice warns in error log 7) Apply patch 8) Create another basket, confirm warns do not show 9) Edit this basket, confirm warns do not show Sponsored-by: Catalyst IT Signed-off-by: Mason James commit 7422485616745b0a0728c0c2349b7372e79296ea Author: Marcel de Rooy Date: Thu Oct 5 10:41:33 2017 +0200 Bug 19415: FindDuplicateAuthority is searching on biblioserver since 16.05 Commit b4392018bc1f9bf6a2f7dfe70b488856ad3a3897 [Bug 12478: make things using SimpleSearch use the new version] changed sub FindDuplicateAuthority and replaced this call (from 3.22.x) in 16.05 (pushed April 2016): my ($error, $results, $total_hits) = C4::Search::SimpleSearch( $query, 0, 1, [ "authorityserver" ] ); The new call does unfortunately not include the authorityserver: my ($error, $results, $total_hits) = $searcher->simple_search_compat( $query, 0, 1 ); Simple_search_compat redirects to C4/Search/SimpleSearch and SimpleSearch assumes a biblioserver if no server is passed. This effectively makes FindDuplicateAuthority useless since we will no longer find duplicates and we could see an error like this in the log: 16:51:42-04/10 zebrasrv(51) [request] Search biblios ERROR 114 1 1+0 RPN @attrset Bib-1 @and @attr 1=authtype PERSO_NAME @attr 1=Heading Moerenhout The fix is obviously trivial. Test plan: [1] Go to Authorities. [2] Add a new authority PERSO_NAME with 100a Moerenhout. [3] Repeat step 2. Verify that you get the duplicate authority warning. Signed-off-by: Marcel de Rooy Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart (cherry picked from commit 56500e8e676782155c5717e8db9786af394252d8) Signed-off-by: Fridolin Somers (cherry picked from commit 2ffe76350ee6373dc27ba8ac098a468875c2f4fb) Signed-off-by: Katrin Fischer commit 4e4651ae1b03e10813e7b03d87e30b6d4c1a0960 Author: Aleisha Amohia Date: Wed Aug 30 04:36:50 2017 +0000 Bug 16204: Show friendly error message if trying to edit record which no longer exists To test: 1) Create a record 2) Click Edit -> Edit record. open this in another tab 3) Delete the record in the original tab 4) Refresh the edit form in the other tab. Notice the software error 5) Apply patch and refresh page 6) There should be a nice error message with the form fields and buttons hidden. Confirm links work as expected. Sponsored-by: Catalyst IT Signed-off-by: Claire Gravely Signed-off-by: Jonathan Druart Signed-off-by: Mason James commit dca9e78990fbb657a688c6f565d57497c27fc4ec Author: Owen Leonard Date: Thu Jun 8 16:01:32 2017 +0000 Bug 15644 - City dropdown default selection when modifying a patron matches only on city This patch modifies the include files which contain the form fields for city, state, zipcode, etc. shown on the patron entry screen. The files are modified so that the city/state/zip