From gitmaster at git.koha-community.org Mon Aug 3 10:03:33 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 03 Aug 2020 08:03:33 +0000 Subject: [koha-commits] main Koha release repository branch 19.11.x updated. v19.11.08-1-gfe7bb53b24 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, 19.11.x has been updated via fe7bb53b24c438a603513bd92a087b741ebf7f65 (commit) from 781c90b3f76619a307ba6ecce39ee5e3b43ab5cb (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 fe7bb53b24c438a603513bd92a087b741ebf7f65 Author: Kyle M Hall Date: Thu Jul 2 08:32:51 2020 -0400 Bug 25914: Fix incorrect variable name causing relative's checkouts column to be empty in OPAC In the OPAC, the title column in the relatives checkouts table is always empty. Test Plan: 1) Enable viewing of relative's checkouts in OPAC 2) Check some items out to a patron 3) Log into the OPAC as a relative of that patron that should be able to view them 4) Note the title column is empty in the relative's checkouts tab 5) Apply this patch 6) Reload the page 7) Titles should appear in the title column! Signed-off-by: Owen Leonard Signed-off-by: Alex Arnaud Signed-off-by: Jonathan Druart (cherry picked from commit 0b69ff1ed7a775b6fdca8513d1ec5a692e30bbe9) Signed-off-by: Lucas Gass (cherry picked from commit d49844d0e1b3ad54c3a7706232437c1a22871fd8) Signed-off-by: Aleisha Amohia ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Aug 3 10:14:12 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 03 Aug 2020 08:14:12 +0000 Subject: [koha-commits] main Koha release repository branch 19.11.x updated. v19.11.08-2-g0a1aee38b8 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, 19.11.x has been updated via 0a1aee38b8f516f63ce6afcac710deecd7e21061 (commit) from fe7bb53b24c438a603513bd92a087b741ebf7f65 (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 0a1aee38b8f516f63ce6afcac710deecd7e21061 Author: Nick Clemens Date: Mon Jun 29 11:04:59 2020 +0000 Bug 25890: Update sorting column for checkouts table Test plan: - Check some items out, all from different libraries - Modify the checkout and due dates, like: 2018-10-22 2018-01-23 2018-05-27 - Sort by checkout date, verify it is actually sorting on homebranch - Apply patch - Reload page - Note you can now sort items correctly Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit 6250c2dc1556dbf0ef87f2bb36f13534cb2e2368) Signed-off-by: Lucas Gass (cherry picked from commit 33cb7a9d0b78fc69b97b687a39170473d662aeee) Signed-off-by: Aleisha Amohia ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Aug 3 12:28:09 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 03 Aug 2020 10:28:09 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v20.05.00-483-g3b24ca4ebb 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 3b24ca4ebb10bee1212d2c133c1d0259bec56d44 (commit) via f8bc0014961c4675b0e0e478330b307d8825d355 (commit) via 19f9bc0528ec0f5cdf000b5120138652b3ece57c (commit) via a7c85ad16303bb1a041663a13336f8446c26ee64 (commit) via 9f11ba114e13aee10e05ccb83096c7f02908085b (commit) via 5d69ae18b5727d122575eb12a34f1712cb96b5b3 (commit) via 7c100a7fd21bd4497be87df4b8cc94674a19c5f5 (commit) from cb5acdc6702cef4668921ccf2537797358981fff (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 3b24ca4ebb10bee1212d2c133c1d0259bec56d44 Author: Jonathan Druart Date: Mon Aug 3 11:57:55 2020 +0200 Bug 24610: Compiled CSS Signed-off-by: Jonathan Druart commit f8bc0014961c4675b0e0e478330b307d8825d355 Author: Julian Maurice Date: Fri Feb 7 11:21:43 2020 +0100 Bug 24610: Let user switch between 'Pay' and 'Write off' mode In patron's accounting section, under 'Make a payment' tab, you have the choice between 'Pay' and 'Write off'. It takes you to another form, but once there you cannot change mode. You have to click on Cancel, re-select the lines you had selected (if you made a selection) and click on the right button. This patch adds link above the form to easily switch between the two modes. Also fixes a CSS bug to be able to use Bootstrap's nav pills inside .statictabs Test plan: 1. Create some manual invoices 2. Go to 'Make a payment' tab 3. Click on the 'Pay' button in a table row 4. Above the form you should see two links ('Pay' and 'Write off'). Click on 'Write off', confirm the write off and verify that it did make a 'write off'. 5. Go to 'Make a payment' tab 6. Click on the 'Write off' button in a table row 7. Click 'Pay', confirm the pay and verify that it did make a 'pay' 8. Go to 'Make a payment' tab 9. Select some lines and click on 'Pay selected' 10. Click on 'Write off', confirm the 'write off' and verify that it did make a 'write off' 11. Go to 'Make a payment' tab 12. Select some lines and click on 'Write off selected' 13. Click on 'Pay', confirm the pay and verify that it did make a 'pay' Signed-off-by: Christofer Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 19f9bc0528ec0f5cdf000b5120138652b3ece57c Author: Owen Leonard Date: Wed Jul 29 12:21:29 2020 +0000 Bug 25762: Typo in linkitem.tt This patch corrects the same typo in two different templates: ’ -> › If you want to test beyond examining the patch, apply the patch and go to Tools -> Rotating collections. - Add an item to a rotating collection. - In the browser's title bar (or the tab title if the title bar isn't shown) the separator between the rotating collection name and "Add or remove items" should be ">" instead of "`" - Enable the EasyAnalyticalRecords system preference. - View the detail page for a bibliographic record. - From the "Edit" menu, choose "Link to host record" - Check the title bar as you did previously. Signed-off-by: Sally Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit a7c85ad16303bb1a041663a13336f8446c26ee64 Author: Owen Leonard Date: Wed Jul 29 12:58:22 2020 +0000 Bug 26085: Add the copy, print and export DataTables buttons to lost items report This patch removes the in-page DataTables DOM configuration option so that the default option is used. This will allow all the standard controls to appear, including copy/print/export. Since the default DataTables information includes the number of results in the table, the template markup showing this information is removed. To test, apply the patch and go to Reports. - Run the "Items lost" report using parameters which will return multiple results. - On the results page confirm that the standard controls are present: Result count, search form, columns filter, export buttons. - Confirm that the "Activate filters" feature works, and that selecting results activates the option to download a CSV using a CSV export profile. Note that the "Activate filters" feature doesn't play well with hidden columns. However this issue predates the patch. Signed-off-by: Sally Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 9f11ba114e13aee10e05ccb83096c7f02908085b Author: Jonathan Druart Date: Thu Jul 30 14:39:17 2020 +0200 Bug 26094: Add class to the "Suggest for purchase" button Bug 14963 added a new "Suggest for purchase" button on the detail page of bibliographic records at the OPAC. This patch adds a specific CSS class to make it reachable easily Like others button in this action list Test plan: Go to the detail page of a bibliographic record at the OPAc Notice the new CSS class Signed-off-by: Sally Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 5d69ae18b5727d122575eb12a34f1712cb96b5b3 Author: Owen Leonard Date: Fri Jul 17 13:20:45 2020 +0000 Bug 26004: Remove unused jQuery plugin jquery.hoverIntent.minified.js from the OPAC The jQuery plugin jquery.hoverIntent.minified.js hasn't been used in Koha in long time. This patch removes it from the OPAC. To test, apply the patch and search for instances of "hoverIntent." There should be none. Signed-off-by: Lucas Gass Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 7c100a7fd21bd4497be87df4b8cc94674a19c5f5 Author: Owen Leonard Date: Fri Jul 17 18:09:30 2020 +0000 Bug 26011: Remove unused jQuery plugin jquery.metadata.min.js from the OPAC The jQuery plugin jquery.metadata.min.js hasn't been used in Koha in long time. This patch removes it from the OPAC. To test, apply the patch and search for instances of "jquery.metadata." There should be none. Signed-off-by: Lucas Gass Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/css/src/staff-global.scss | 2 +- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +- .../prog/en/modules/cataloguing/linkitem.tt | 2 +- .../prog/en/modules/members/paycollect.tt | 22 ++++++++++++++++++++++ .../prog/en/modules/reports/itemslost.tt | 9 --------- .../en/modules/rotating_collections/addItems.tt | 2 +- .../bootstrap/en/includes/opac-detail-sidebar.inc | 2 +- .../jquery/plugins/jquery.hoverIntent.minified.js | 9 --------- .../lib/jquery/plugins/jquery.metadata.min.js | 8 -------- 9 files changed, 27 insertions(+), 31 deletions(-) delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/lib/jquery/plugins/jquery.hoverIntent.minified.js delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/lib/jquery/plugins/jquery.metadata.min.js hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Aug 3 22:50:01 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 03 Aug 2020 20:50:01 +0000 Subject: [koha-commits] main Koha release repository branch 19.11.x updated. v19.11.08-4-g73e40ba804 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, 19.11.x has been updated via 73e40ba8044a05e2bf13f1b8492fe1cf2c46d742 (commit) via ad619e2dc3e012e6b54e79ee92577f0730ba01cc (commit) from 0a1aee38b8f516f63ce6afcac710deecd7e21061 (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 73e40ba8044a05e2bf13f1b8492fe1cf2c46d742 Author: Bernardo Gonzalez Kriegel Date: Sun May 24 08:51:27 2020 -0300 Bug 25443: (follow-up) surround strings with Signed-off-by: Bernardo Gonzalez Kriegel Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart (cherry picked from commit 46d3ec264c4e46cc73ee1713b5c39e6c564e5a1a) Signed-off-by: Lucas Gass (cherry picked from commit 5680e79f0da5795ab0f99a7b145a6b2115fd39e4) Signed-off-by: Aleisha Amohia commit ad619e2dc3e012e6b54e79ee92577f0730ba01cc Author: Katrin Fischer Date: Sun May 24 02:04:03 2020 +0200 Bug 25443: Improve translation of 'Select the record to link%s to' Before this patch the title was set in italic, which caused the translation string to be cut off. Removing the italic formatting in favor of quotes and splitting the string into 2 sentences (dealing with title existing and not existing: Select the host record to link to '[% bibliotitle | html %]' Select the host record to link To test: - Activate EasyAnalyticalRecords system preference - Search for a record in staff - Use Edit > Link to host record - Verify the text is shown as above with the reord's title - The second case is a bit theoretical: - Delete 245$a from the record or empty out biblio.title using SQL - Verify the string still shows but without the 'to...' part. Signed-off-by: Bernardo Gonzalez Kriegel Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart (cherry picked from commit d53b58cab858f06be7f9762b16b89c8bfbce5625) Signed-off-by: Lucas Gass (cherry picked from commit f7b93ef9c54bd1ce662ff7147f958a6fa73369a2) Signed-off-by: Aleisha Amohia ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Aug 3 23:45:59 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 03 Aug 2020 21:45:59 +0000 Subject: [koha-commits] main Koha release repository branch 19.11.x updated. v19.11.08-10-g4bc5656927 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, 19.11.x has been updated via 4bc565692778cf8521e0e8ce7ea841babe83d918 (commit) via ca186563c1cd8df18606cd48cffed47633674d5f (commit) via 3a8c118931149173d3e1afc0255243c458cdadc8 (commit) via 93ad4e2d52290607b0fbd023e41e1ccc42c950c4 (commit) via 048f154e772bed09b50cb6343e89adb4ff4d78f6 (commit) via 0656ff9a99d733b483e6b800d8b58554435109b5 (commit) from 73e40ba8044a05e2bf13f1b8492fe1cf2c46d742 (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 4bc565692778cf8521e0e8ce7ea841babe83d918 Author: Aleisha Amohia Date: Fri Jul 31 00:39:34 2020 +1200 [19.11.x] Bug 25850: Tests fail when useDaysMode is not set to Calendar t/db_dependent/Calendar.t tests fail This patch is needed as long as useDaysMode is checked in Koha::Calendar->_init Signed-off-by: Aleisha Amohia commit ca186563c1cd8df18606cd48cffed47633674d5f Author: Martin Renvoize Date: Fri Jun 26 16:24:00 2020 +0100 Bug 25850: Add tests for weekday holidays Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 4ed4e468d2ceaf4502b817feb791656d5a159fa5) Signed-off-by: Lucas Gass (cherry picked from commit e6522ea63c6258b162c23731d2d3ff3950808152) Signed-off-by: Aleisha Amohia commit 3a8c118931149173d3e1afc0255243c458cdadc8 Author: Nick Clemens Date: Tue Jul 7 12:05:42 2020 +0000 Bug 25850: (QA follow-up) use dt_from_string Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 92970a9abad312a07d9efba46cc57b27469a0509) Signed-off-by: Lucas Gass (cherry picked from commit f63c82a30f2e9455ce07085f3030d5160658c9f7) Signed-off-by: Aleisha Amohia commit 93ad4e2d52290607b0fbd023e41e1ccc42c950c4 Author: Martin Renvoize Date: Mon Jun 29 09:54:58 2020 +0100 Bug 25850: (QA follow-up) Match logic in is_holiday Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit afd88e1d21a5cb5f2198c058144065b64098c124) Signed-off-by: Lucas Gass (cherry picked from commit 4c0d7b14bebcedb802488ee1fb200a2c7513ca91) Signed-off-by: Aleisha Amohia commit 048f154e772bed09b50cb6343e89adb4ff4d78f6 Author: Andreas Jonsson Date: Tue Jun 23 15:57:29 2020 +0200 Bug 25850: Adapt day of week in Koha::Calendar::get_push_amt to 0..6 with 0 being Sunday. 1. Go to tools -> calendar and make sure Sundays are holidays by adding a holiday on a Sunday and selecting "Holiday repeated every same day of the week" and "Copy to all libraries" and save. 2. Go to administration -> system preferences and select "Use the calendar to push the due date to the next open matching weekday for weekly loan periods, or the next open day otherwise" for the system preference "useDaysMode" and save the system preferences. 3. Put the below code in a file name test.pl and execute it using the command "sudo koha-shell -c 'perl test.pl' kohadev" use Koha::Calendar; my $calendar = Koha::Calendar->new( branchcode => 'CPL' ); $dt = DateTime->new( year => 2020, month => 06, day => 21 ); print "This is a sunday: " . $dt->day_of_week . "\n"; my $ndt = $calendar->next_open_days($dt, 0); print "This is a monday: " . $ndt->day_of_week . "\n"; 4. Without the patch applied, this script will freeze after printing "This is a sunday ...". Abort using ctrl-c. 5. Apply patch and run the script again. The test script will now complete. Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 25127f422821756b030b8f377b3e112b907be5eb) Signed-off-by: Lucas Gass (cherry picked from commit 238b2af84fe8efe8a740758a774f3587717ffb2b) Signed-off-by: Aleisha Amohia commit 0656ff9a99d733b483e6b800d8b58554435109b5 Author: Martin Renvoize Date: Fri Jun 26 16:52:50 2020 +0100 Bug 25850: Regression Test This patch adds a unit test to test for an infinite loop as highlighted by the bug. Test plan 1/ Run the test before applying the fix 2/ The test should fail for 'Sundays' 3/ Apply the subsquent patch 4/ Re-run the test 5/ It should now pass Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 95c8d19530e8bef20e02be0b74d7927764bf7ed1) Signed-off-by: Lucas Gass (cherry picked from commit f5f3269e25169e295fa495dc6b38114edcb767a6) Signed-off-by: Aleisha Amohia ----------------------------------------------------------------------- Summary of changes: Koha/Calendar.pm | 9 +++- t/db_dependent/Calendar.t | 102 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 109 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Aug 4 00:17:42 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 03 Aug 2020 22:17:42 +0000 Subject: [koha-commits] main Koha release repository branch 19.11.x updated. v19.11.08-11-gfe86de9047 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, 19.11.x has been updated via fe86de90479a4f6a6a52277490a83cf8e133dbba (commit) from 4bc565692778cf8521e0e8ce7ea841babe83d918 (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 fe86de90479a4f6a6a52277490a83cf8e133dbba Author: Nick Clemens Date: Thu May 21 13:41:23 2020 +0000 Bug 25566: Add option to ignore found holds and use it when checking high holds To test: 1 - Find or create a record with 10 items 2 - Set sysprefs: decreaseLoanHighHolds - enable decreaseLoanHighHoldsDuration - 2 decreaseLoanHighHoldsValue - 2 decreaseLoanHighHoldsControl - 'over the number of holdable items'/dynamic 3 - Set circ rules to allow 1 hold per record on the relevant record 4 - Place 3 holds on the record 5 - Check one item in and confirm hold to set to waiting 6 - Issue to the patron with the waiting hold 7 - Get a notice that loan period is decreased 8 - Don't confirm the checkout 9 - Apply patch 10 - Restart all the things 11 - Repeat checkout, no decrease this time! Signed-off-by: Christopher Brannon Signed-off-by: Martin Renvoize (cherry picked from commit 96a871035043c7ffd93c61e756ee1ff89e3da0f0) Signed-off-by: Lucas Gass (cherry picked from commit d59536e289692537289460a9225cc0c0bce80a57) Signed-off-by: Aleisha Amohia ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 2 +- C4/Reserves.pm | 29 ++++++++++++++++++----------- t/db_dependent/DecreaseLoanHighHolds.t | 26 ++++++++++++++++++++++---- t/db_dependent/Reserves/MultiplePerRecord.t | 7 +++++-- 4 files changed, 46 insertions(+), 18 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Aug 4 00:19:37 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 03 Aug 2020 22:19:37 +0000 Subject: [koha-commits] main Koha release repository branch 19.11.x updated. v19.11.08-12-gf4c2d263ae 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, 19.11.x has been updated via f4c2d263ae0136e1a2d6ef0fb3dc1eed3a0a6266 (commit) from fe86de90479a4f6a6a52277490a83cf8e133dbba (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 f4c2d263ae0136e1a2d6ef0fb3dc1eed3a0a6266 Author: Martin Renvoize Date: Tue Jul 7 09:27:48 2020 +0100 Bug 25944: Schema fix for illrequests route The illrequests path was missing the `comments` and `status_alias` embedable relations in the path specification. Test plan: 1/ Ensure you have the latest Mojolicious + OpenAPI modules installed. 2/ Navigate to the ill requests page and note that the table is empty. 3/ Note that under the networking tab in your browsers developer tools that the api call fails with a 400 error. 4/ Apply the patch 5/ Refresh the page 6/ The table should now load and the api route should return a proper 200 response. 7/ Signoff Signed-off-by: Martin Renvoize Signed-off-by: Magnus Enger Applied the patch to a production server that was having the 400 error on the main ILL page, and the error was gone. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Martin Renvoize (cherry picked from commit 40ab030060d6cbacb0be9df981fb28a6ade705ea) Signed-off-by: Lucas Gass (cherry picked from commit 0cd877fb743154a76642952f454df1502302338a) Signed-off-by: Aleisha Amohia ----------------------------------------------------------------------- Summary of changes: api/v1/swagger/paths/illrequests.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Aug 4 00:24:54 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 03 Aug 2020 22:24:54 +0000 Subject: [koha-commits] main Koha release repository branch 19.11.x updated. v19.11.08-13-g39547a6279 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, 19.11.x has been updated via 39547a6279e418823a23809c813dc198a07eca75 (commit) from f4c2d263ae0136e1a2d6ef0fb3dc1eed3a0a6266 (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 39547a6279e418823a23809c813dc198a07eca75 Author: Andrew Fuerste-Henry Date: Fri Jun 12 13:51:16 2020 +0000 Bug 25726: make holds to pull ignore holds where found is not null and itemnumber is null To test: 1- place 2 bib-level holds on available items 2- confirm they both show on Holds to Pull 3- edit one hold from the database to set found='T' 4- reload Holds to Pull, confirm it is now empty 5- apply patch 6- Reload Holds to Pull 7- confirm it now shows the hold you did not edit Signed-off-by: donnab Signed-off-by: Marcel de Rooy [EDIT] Using capitals for SQL reserved words; added a FIXME Tested with: update reserves set found='T', itemnumber=NULL where reserve_id=... This should be a workaround while we fix the underlying problem. Signed-off-by: Jonathan Druart (cherry picked from commit 56220d211d7b5c4e2622787f9ea38ab12c8868f5) Signed-off-by: Lucas Gass (cherry picked from commit cb76501776b3d03cf7c513b50c6b38630740416e) Signed-off-by: Aleisha Amohia ----------------------------------------------------------------------- Summary of changes: circ/pendingreserves.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Aug 4 00:27:27 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 03 Aug 2020 22:27:27 +0000 Subject: [koha-commits] main Koha release repository branch 19.11.x updated. v19.11.08-14-ge119734445 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, 19.11.x has been updated via e119734445fb8fcaaded84e0b25b5a9056a5b2de (commit) from 39547a6279e418823a23809c813dc198a07eca75 (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 e119734445fb8fcaaded84e0b25b5a9056a5b2de Author: David Cook Date: Wed Jul 8 07:10:50 2020 +0000 Bug 25950: Remove in X-Forwarded-For from proxy tests This patch removes the ip address in the X-Forwarded-For header from being tested against koha_trusted_proxies. Without this patch, REMOTE_ADDR will be set to null, if the ip address matches against koha_trusted_proxies. To Test: 1. Run the unit test t/Koha/Middleware/RealIP.t Signed-off-by: Didier Gautheron Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart (cherry picked from commit 7b84fda33b23347846ae50016f1e4b38b0fd95f4) Signed-off-by: Lucas Gass (cherry picked from commit 8c27b372a4968d5b0d99e512a781302f09a769bf) Signed-off-by: Aleisha Amohia ----------------------------------------------------------------------- Summary of changes: Koha/Middleware/RealIP.pm | 3 +- t/Koha/Middleware/RealIP.t | 152 +++++++++++++++++++++++++++++---------------- 2 files changed, 100 insertions(+), 55 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Aug 4 00:34:41 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 03 Aug 2020 22:34:41 +0000 Subject: [koha-commits] main Koha release repository branch 19.11.x updated. v19.11.08-15-gb4e9d551dc 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, 19.11.x has been updated via b4e9d551dcd951e5f92f138cfa152d590a9fd49e (commit) from e119734445fb8fcaaded84e0b25b5a9056a5b2de (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 b4e9d551dcd951e5f92f138cfa152d590a9fd49e Author: Nick Clemens Date: Wed Jun 24 16:17:19 2020 +0000 Bug 25869: Fix Coce display for lists To test: 1 - Enable Coce for Opac CoceHost: https://coce.bywatersolutions.com CoceProviders: Select all OpacCoce: Enable 2 - Do a search on the Opac, confirm you see some covers 3 - Add some of the items with covers to a public list 4 - View the public list 5 - Note no covers display 6 - Apply patch 7 - Success! Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit f77a377c939080eed36401746b5d722c91ee964b) Signed-off-by: Lucas Gass (cherry picked from commit ca2e551a4ab5aaf5a9e9fb0b87af4519d8fb5d61) Signed-off-by: Aleisha Amohia ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Aug 4 00:50:56 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 03 Aug 2020 22:50:56 +0000 Subject: [koha-commits] main Koha release repository branch 19.11.x updated. v19.11.08-16-gbe39690df9 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, 19.11.x has been updated via be39690df9b44d400c3a0fa6633f524d2ecf62c0 (commit) from b4e9d551dcd951e5f92f138cfa152d590a9fd49e (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 be39690df9b44d400c3a0fa6633f524d2ecf62c0 Author: Fridolin Somers Date: Wed Jun 24 17:05:30 2020 +0200 Bug 25868: Fix transfers page to show effective itemtype In transfers page /cgi-bin/koha/circ/branchtransfers.pl : Itemtype is always from biblioitems.itemtype, regardless of system preference item-level_itypes. Patch also changes template to use the object Koha::Item. Patch also fixes a small typo : closed
tag. Test plan : 1) Test with both values of system preference 'item-level_itypes' 2) Go to Circulation > Transfert 3) Enter a barcode 4) Enter another barcode 5) Check you see in table all datas and that 'Item type' is correct Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit e441cb35fb13670e65b9437706561c17d1311945) Signed-off-by: Lucas Gass (cherry picked from commit 797af6754455b9c029679e8d3c345c8a09ee9b30) Signed-off-by: Aleisha Amohia ----------------------------------------------------------------------- Summary of changes: circ/branchtransfers.pl | 44 ++++++---------------- .../prog/en/modules/circ/branchtransfers.tt | 28 ++++++++------ 2 files changed, 28 insertions(+), 44 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Aug 4 01:03:39 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 03 Aug 2020 23:03:39 +0000 Subject: [koha-commits] main Koha release repository branch 19.11.x updated. v19.11.08-17-g7d1850d8ba 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, 19.11.x has been updated via 7d1850d8ba324ddd27b5854d88fe508dc061145a (commit) from be39690df9b44d400c3a0fa6633f524d2ecf62c0 (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 7d1850d8ba324ddd27b5854d88fe508dc061145a Author: Didier Gautheron Date: Wed Jun 24 16:03:16 2020 +0200 Bug 25862: Prevent TinyMCE to mangle local url links To test: 1 create a report 1 if it doesn't exist 2 open /cgi-bin/koha/tools/koha-news.pl 3 create a news 4 add a HTML link with Insert/Edit link tinyMCE dialog box to /cgi-bin/koha/reports/guided_reports.pl?reports=1&phase=Run%20this%20report "report 1" 5 save 6 on the main page "report 1" link returns a 404 error Apply patch 7 Modify news' URL 8 Test it works in: tools/koha-new.pl admin/branches.pl and admin/preferences.pl Signed-off-by: Lucas Gass Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit 2fbe775070637ebdddcc9ea0b455e80dbb85a83d) Signed-off-by: Lucas Gass (cherry picked from commit ace1e3e53e6332cba767594f6caa0be97ce2e198) Signed-off-by: Aleisha Amohia ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/includes/wysiwyg-systempreferences.inc | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt | 1 + 3 files changed, 3 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Aug 4 01:06:33 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 03 Aug 2020 23:06:33 +0000 Subject: [koha-commits] main Koha release repository branch 19.11.x updated. v19.11.08-18-g34127f17bf 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, 19.11.x has been updated via 34127f17bf9c12ed67250a366836a8bf4ef20f29 (commit) from 7d1850d8ba324ddd27b5854d88fe508dc061145a (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 34127f17bf9c12ed67250a366836a8bf4ef20f29 Author: Lucas Gass Date: Tue Jan 21 17:53:09 2020 +0000 Bug 24473: Add $raw filter for Syndetics content Syndetics offers enhanced content in the OPAC under the tabs 'Title Notes', 'Excerpt', 'About the author', 'Editions'. They provide this info as HTML therefore we should filter it as $raw so the content shows up without the markup. Signed-off-by: Stina Hallin Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit 6b9572e0c8fb9f1ad1e60ed5db50e69c60ac1a00) Signed-off-by: Lucas Gass (cherry picked from commit def7b5d1706fe145c61b18d17fe5251ab92e6dd7) Signed-off-by: Aleisha Amohia ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Aug 4 01:12:05 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 03 Aug 2020 23:12:05 +0000 Subject: [koha-commits] main Koha release repository branch 19.11.x updated. v19.11.08-19-gbc49cb0b13 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, 19.11.x has been updated via bc49cb0b13658131c033fd803f0a3ad741200226 (commit) from 34127f17bf9c12ed67250a366836a8bf4ef20f29 (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 bc49cb0b13658131c033fd803f0a3ad741200226 Author: Didier Gautheron Date: Tue Apr 28 07:43:46 2020 +0200 Bug 25293: Don't call escapeHtml on null Test Plan: 1) Create two Checkouts 2) view patron's checkout list cgi-bin/koha/members/moremember.pl?borrowernumber=pp 3) in mysql shell delete a checkout home branch: update items set homebranch = null where itemnumber = xx; 4) view patron's checkout list, again Without this patch the list is empty. Same if biblio title is null (update biblio set title = null where biblionumber = yy;). Javascript error: TypeError: oObj.title is null Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit 2b56ae1d4a231a83f52420ec9efc4829226fa86a) Signed-off-by: Lucas Gass (cherry picked from commit 6cbd0a6257dabab98959d2c5a090fca84213eefa) Signed-off-by: Aleisha Amohia ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Aug 4 01:31:42 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 03 Aug 2020 23:31:42 +0000 Subject: [koha-commits] main Koha release repository branch 19.11.x updated. v19.11.08-22-gca7607af5c 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, 19.11.x has been updated via ca7607af5cdfcf96833d5b883a61e1d629a38056 (commit) via 68f16bb3401ee825425fc115d8ace5b525af37c9 (commit) via 832076f727b12bb0b93173275845cea60096e337 (commit) from bc49cb0b13658131c033fd803f0a3ad741200226 (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 ca7607af5cdfcf96833d5b883a61e1d629a38056 Author: Martin Renvoize Date: Thu Jun 11 10:14:03 2020 +0100 Bug 25155: (follow-up) Increase headings levels by 1 In the previous patch we reduced the headings levels by 2, but this was one level too many as we already have an H1 in the navbar and so all other heading sets should start at level 2 to semantically follow the title heading. Signed-off-by: Sally Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit c9a0243f3abf407e1a89d7bfc125911cc153b3cc) Signed-off-by: Lucas Gass (cherry picked from commit 3a9597ea481a6be3b32011aa0d0e317e4dec77dd) Signed-off-by: Aleisha Amohia commit 68f16bb3401ee825425fc115d8ace5b525af37c9 Author: Martin Renvoize Date: Thu Jun 11 09:32:45 2020 +0100 Bug 25155: Fixing semantic headings login modal The login modal headings were semantically incorrect prior to this patch. Test plan: 1) Click the 'Log in to your account' option to expose the modal 2) Use a headings inspector and note we jump from H1 (Page Title) -> H3 (Modal Title) 3) Apply the patch and reload the page. 4) Click the 'Log in to your account' option to expose the modal 5) The modal should still appear well formed 6) Use a headings inspector and note we jump from H1 (Page Title) -> H2 (Modal Title) -> H3 (Shibboleth title if enabled) Signed-off-by: Martin Renvoize Signed-off-by: Sally Signed-off-by: Jonathan Druart (cherry picked from commit 513b226873759ba3df6765dce635fe96cf5a51f3) Signed-off-by: Lucas Gass (cherry picked from commit 482fc13558437013479b31e7a553fd0919ee97c5) Signed-off-by: Aleisha Amohia commit 832076f727b12bb0b93173275845cea60096e337 Author: Hayley Mapley Date: Thu Jun 11 13:13:30 2020 +1200 Bug 25155: Fixing semantic headings in opac-auth.tt Test plan: 1) Follow test plan from comment #1 2) Apply the patch 3) Reload the page, and note that is still displays fine 4) Check that the main heading is now an h1, and that the other headings on the page make sense Signed-off-by: Martin Renvoize Signed-off-by: Sally Signed-off-by: Jonathan Druart (cherry picked from commit 0bc47b5302fba91c1315acee5533ec5917df5761) Signed-off-by: Lucas Gass (cherry picked from commit 7e224455099b0fd33a0c65e8d0647efa2d45419a) Signed-off-by: Aleisha Amohia ----------------------------------------------------------------------- Summary of changes: .../opac-tmpl/bootstrap/en/includes/masthead.inc | 6 +++--- .../opac-tmpl/bootstrap/en/modules/opac-auth.tt | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Aug 4 01:36:38 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 03 Aug 2020 23:36:38 +0000 Subject: [koha-commits] main Koha release repository branch 19.11.x updated. v19.11.08-23-ge0b84c8132 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, 19.11.x has been updated via e0b84c81321dba72f6c333eabe0ac4ca8e81cb4b (commit) from ca7607af5cdfcf96833d5b883a61e1d629a38056 (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 e0b84c81321dba72f6c333eabe0ac4ca8e81cb4b Author: Martin Renvoize Date: Thu Jun 11 12:45:57 2020 +0100 Bug 25237: Fix semantic heading for opac-details Prior to this patch the opac-details view contained semantically incorrect h3 headings for the author information. Test plan 1/ Perform a search in the OPAC that will yield results 2/ Navigate to any results detailed view 3/ Inspect the page and note that there are semantically incorrect headings H1 (Page title) > H2 (Item title) > H5 (Author) 4/ Apply the patch 5/ Reload the page 6/ Inspect the page and note that the semantically incorrect author block has been converted to a span with an 'h3' class for styling 7/ Note the page still appears nicely 8/ Signoff Bonus points: Check with XSLT views enabled and disabled. Signed-off-by: Sally Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit 6b49a70b94d6b5e0e2e1cde3025ade1278814925) Signed-off-by: Lucas Gass (cherry picked from commit bb805283f6094c0ba0988b574bd7ee8b5492f53f) Signed-off-by: Aleisha Amohia ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Aug 4 01:39:20 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 03 Aug 2020 23:39:20 +0000 Subject: [koha-commits] main Koha release repository branch 19.11.x updated. v19.11.08-25-g241a985c65 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, 19.11.x has been updated via 241a985c65567e7d322539e1566e616a1d861874 (commit) via f16bedc6358acc6c07a52ed7aca9586a0cd4f097 (commit) from e0b84c81321dba72f6c333eabe0ac4ca8e81cb4b (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 241a985c65567e7d322539e1566e616a1d861874 Author: Julian Maurice Date: Fri Jul 3 17:36:04 2020 +0400 Bug 25922: Fix typo 'arial-label' -> 'aria-label' Signed-off-by: Julian Maurice Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit 73ff914d5d537947b5fdc4cd602e79f41af5179a) Signed-off-by: Lucas Gass (cherry picked from commit 48ba19be8e3351f665df8f4ccdde22b63ecab416) Signed-off-by: Aleisha Amohia commit f16bedc6358acc6c07a52ed7aca9586a0cd4f097 Author: Martin Renvoize Date: Fri Jul 3 14:07:25 2020 +0100 Bug 25922: Add aria-label to the allowlist for translation This patch adds aria-label to the allowlist for translations. To test: - Apply patches from here and bug 25244 - kshell - cd misc/translator - perl translate update de-DE - Check for the aria-label in the diff - Verify the strings appear in the po files now - Translate them - perl translate install de-DE - Verify the translated strings appear in the template Signed-off-by: Julian Maurice Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit 280f1bdeb3cbec9f57d71e980490e32af61eecfb) Signed-off-by: Lucas Gass (cherry picked from commit 21be26f25b7f60c0cadfe247b8efc66cf733551b) Signed-off-by: Aleisha Amohia ----------------------------------------------------------------------- Summary of changes: misc/translator/tmpl_process3.pl | 6 +++--- misc/translator/xgettext.pl | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Aug 4 01:40:47 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 03 Aug 2020 23:40:47 +0000 Subject: [koha-commits] main Koha release repository branch 19.11.x updated. v19.11.08-26-g922df35371 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, 19.11.x has been updated via 922df35371b4644aa5b729c2fff687ce1ec12a38 (commit) from 241a985c65567e7d322539e1566e616a1d861874 (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 922df35371b4644aa5b729c2fff687ce1ec12a38 Author: Martin Renvoize Date: Mon Jun 29 15:55:17 2020 +0100 Bug 25244: Add specific aria-label to search results This patch adds an arai-lebel to the select checkboxes on the search results page of the OPAC. Test plan 1/ Perform a search that will yield some results 2/ Inspect the 'checkbox' on the left side of the results table 3/ Note that there is no arai-label 4/ Apply patch 5/ Refresh the search results page 6/ Inspect the 'checkbox' on the left side of the results table 7/ Note that the aria-label now appears and contains relavant information 8/ Signoff Signed-off-by: Owen Leonard Signed-off-by: Julian Maurice Bug 25244: (follow-up) QA corrections Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart (cherry picked from commit d1a7112a9054305ead325daedd6bb106a31b346f) Signed-off-by: Lucas Gass (cherry picked from commit ea51c1a865c20e29ab6c10bc017cbe40a1b314a3) Signed-off-by: Aleisha Amohia ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Aug 4 01:51:22 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 03 Aug 2020 23:51:22 +0000 Subject: [koha-commits] main Koha release repository branch 19.11.x updated. v19.11.08-28-gcfedaa31c2 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, 19.11.x has been updated via cfedaa31c240ae0e95066e676b712cc55d72effc (commit) via b2f5bbbbd70e0cd746addd878043a178d5a835b6 (commit) from 922df35371b4644aa5b729c2fff687ce1ec12a38 (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 cfedaa31c240ae0e95066e676b712cc55d72effc Author: Aleisha Amohia Date: Fri Jul 31 02:49:20 2020 +1200 Bug 25984: Compile CSS Signed-off-by: Aleisha Amohia commit b2f5bbbbd70e0cd746addd878043a178d5a835b6 Author: Owen Leonard Date: Mon Jul 13 15:18:23 2020 +0000 Bug 25984: Add minimum height and width to shelf browser covers This patch adds a class to the shelf browser cover image links and a style for these links defining a minimum height and width. This allows the browser's default tab focus outline to be visible. This patch also adds a check for an enabled cover image service before displaying the cover image links. This patch introduces whitespace changes so diff accordingly. To test, apply the patch and rebuild the OPAC CSS (https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client). - Enable the OPACShelfBrowser system preference. - Enable at least one cover image service (Amazon, Google, Coce, etc). - Locate a title in the OPAC which has items attached. - On the bibliographic detail page, click the "Browse shelf" link in the table of holdings to display the shelf browser. - Use the tab key to move the focus to cover images in the shelf browser. - Confirm that the focus outline moves through each cover link whether or not there is a cover image available. - Diable all cover image services. - Test the shelf browser again and confirm that it's not necessary to tap through an empty row. Signed-off-by: Martin Renvoize Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit e722dd1725e113acd79dcb9e8eed2cd4da35aa33) Signed-off-by: Lucas Gass (cherry picked from commit 84caea12382e24fcfa6429a7e1a69e4a3043d70d) Signed-off-by: Aleisha Amohia ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/bootstrap/css/opac.css | 2 +- koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss | 6 ++ .../bootstrap/en/includes/shelfbrowser.inc | 80 +++++++++++----------- 3 files changed, 48 insertions(+), 40 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Aug 4 02:11:02 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 04 Aug 2020 00:11:02 +0000 Subject: [koha-commits] main Koha release repository branch 19.11.x updated. v19.11.08-29-g63e28d62bd 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, 19.11.x has been updated via 63e28d62bdeb3e37f82974c83ce8057574d13e3a (commit) from cfedaa31c240ae0e95066e676b712cc55d72effc (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 63e28d62bdeb3e37f82974c83ce8057574d13e3a Author: Jonathan Druart Date: Tue Jul 21 12:36:17 2020 +0200 Bug 26033: Use pic.infini.fr instead of framapic https://framapic.org/ is closing """ Framapic will be closing its doors on Tuesday, January 12, 2021. You will find a similar service on this page. Uploading images is now disabled, but you can still retrieve your images on the My images page. """ https://framablog.org/2019/09/26/lets-de-frama-tify-the-internet/ https://framablog.org/2020/03/03/10-bonnes-raisons-de-fermer-certains-services-framasoft-la-5e-est-un-peu-bizarre/ (French) We can still use another service. However we may think about hosting the service ourself! Test plan: Modify a selenium script to make it fail (for instance modify the path for a find_element call) Run it Confirm that the screenshot has been uploaded correctly and that the link works Signed-off-by: Victor Grousset/tuxayo Signed-off-by: Jonathan Druart (cherry picked from commit 8aa907379eb54d360746c3e15051327a1e6cc1fe) Signed-off-by: Lucas Gass (cherry picked from commit e51c7a73c00b28d2e5091b021ced867fc5942b3b) Signed-off-by: Aleisha Amohia ----------------------------------------------------------------------- Summary of changes: t/lib/Selenium.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Aug 4 02:13:10 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 04 Aug 2020 00:13:10 +0000 Subject: [koha-commits] main Koha release repository branch 19.11.x updated. v19.11.08-30-ge1df84e9ec 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, 19.11.x has been updated via e1df84e9ecae7d48e91f2e08333b664de39ce912 (commit) from 63e28d62bdeb3e37f82974c83ce8057574d13e3a (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 e1df84e9ecae7d48e91f2e08333b664de39ce912 Author: Jonathan Druart Date: Mon Jul 27 15:15:44 2020 +0200 Bug 25729: Prevent Charges/Fees.t to fail on slow server We must use t::lib::Dates::compare to compare dates Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit fcd659b2d4cf62df48113567c59392e8dff9696f) Signed-off-by: Lucas Gass (cherry picked from commit ddfec0a706c2233ea60bbdb990b5368ceebc982f) Signed-off-by: Aleisha Amohia ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Koha/Charges/Fees.t | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Aug 4 02:15:43 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 04 Aug 2020 00:15:43 +0000 Subject: [koha-commits] main Koha release repository branch 19.11.x updated. v19.11.08-32-gdb5ae24f88 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, 19.11.x has been updated via db5ae24f887bd10f8b3c5cf3e0cc65e3ae3178d1 (commit) via 63802370efc001600524314e222d619e28da7ea8 (commit) from e1df84e9ecae7d48e91f2e08333b664de39ce912 (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 db5ae24f887bd10f8b3c5cf3e0cc65e3ae3178d1 Author: Nick Clemens Date: Fri Jun 12 10:51:36 2020 +0000 Bug 25724: Do not call ModReserveStatus when completing transfer I can not see how this code is useful here. It checks for a reserve with priority 0 and found = NULL That is not a status that should occur when filling a transfer. Either the found is 'T' if we are transferring due to the hold, or the hold was placed after the transfer was initiated, and so the priority is not 0 Additional, AddReturn checks for reserves later and asks the staff to confirm waiting status. ModReserveStatus also calls CartToShelf regardless of what happens here. To test: 1 - Set UpdateItemLocationOnCheckin to: _ALL_: CART 2 - SetAutomaticItemReturn = Do 3 - Check an item in at a different branch than it's homebranch to create a transfer 4 - Check the item in at it's homebranch 5 - View the item details page 6 - Item is not in CART location 7 - Apply patch 8 - Repeat 9 - Item is in CART location after completion of transfer Signed-off-by: Andrew Fuerste-Henry Signed-off-by: Jason Robb Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit e025cd76437b212746717ad54b5da22e410bbe8f) Signed-off-by: Lucas Gass (cherry picked from commit 51cd56ddb37dbb3c92105d948b8a83b98ad6bcfb) Signed-off-by: Aleisha Amohia commit 63802370efc001600524314e222d619e28da7ea8 Author: Nick Clemens Date: Fri Jun 12 11:11:26 2020 +0000 Bug 25724: Unit tests Signed-off-by: Andrew Fuerste-Henry Signed-off-by: Jason Robb Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit 028e9a07db625845482eff1b550a9bbe86ec6fbc) Signed-off-by: Lucas Gass (cherry picked from commit bc1e7669bd2b1abccba7b1975b66adac0de550d2) Signed-off-by: Aleisha Amohia ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 2 -- t/db_dependent/Circulation/issue.t | 12 +++++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Aug 4 02:17:42 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 04 Aug 2020 00:17:42 +0000 Subject: [koha-commits] main Koha release repository branch 19.11.x updated. v19.11.08-33-gd8c9583f2f 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, 19.11.x has been updated via d8c9583f2fb2c329a0fd8cca43de663c9d8a512f (commit) from db5ae24f887bd10f8b3c5cf3e0cc65e3ae3178d1 (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 d8c9583f2fb2c329a0fd8cca43de663c9d8a512f Author: Lucas Gass Date: Mon Jul 6 20:38:42 2020 +0000 Bug 25940: Check for reserve_id before Dopop TEST PLAN: 1. Have an item belonging to a different branch and check it in. 2. When the modal pops up hit 'Yes, print slip' or 'Print slip' if AutomaticItemReturn is set to 'don't' 3. The first print dialog should appear with a URL like '/cgi-bin/koha/circ/transfer-slip.pl?transferitem=18&&branchcode=CPL&op=slip' 4. Close that print dialog and you will immediately see another one that says 'No slip template found'. 5. Notice the URL of the second pop-up is: /cgi-bin/koha/circ/hold-transfer-slip.pl?reserve_id= 6. There is no reserve id so the template is not found. 7. Apply patch 8. Repeat 1-6 9. You should no longer have two print dialogs Signed-off-by: Lisette Scheer Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit 0ec7ba72861f21c2ce83d3a98446af7db7a3e321) Signed-off-by: Lucas Gass (cherry picked from commit 25f91e5f431f8a8f06ac3710d776c7ed57d3bd20) Signed-off-by: Aleisha Amohia ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/circ/returns.tt | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Aug 4 02:20:13 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 04 Aug 2020 00:20:13 +0000 Subject: [koha-commits] main Koha release repository branch 19.11.x updated. v19.11.08-35-gfa08592991 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, 19.11.x has been updated via fa08592991a875b81f5cc3c6bec555b0e5f866b8 (commit) via df53ab009445f9ed96b2ef99dc5f0d046d16a96c (commit) from d8c9583f2fb2c329a0fd8cca43de663c9d8a512f (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 fa08592991a875b81f5cc3c6bec555b0e5f866b8 Author: Kyle M Hall Date: Wed Sep 18 10:28:33 2019 -0400 Bug 23086: Search for collection is broken It appears that we are quoting the ccode values deep in the search code. Under ICU chains this breaks searching by limits To recreate 1 - Setup Koha using Zebra and icuchains 2 - Add ccode to AdvancedSearchTypes 3 - In koha-conf.xml set zebra debug level to include request none,fatal,warn,request,info 4 - Set some items into different ccodes 5 - On opac perform a search for: ccode:NFIC 6 - It works 7 - tail -n 50 /var/log/koha/kohadev/zebra-output.log 8 - Note search request like: Search biblios OK 26 1 1+0 RPN @attrset Bib-1 @attr 1=8009 NFIC 9 - On opac go to advanced search, select Collection, and limit to smae code a s above 10 - No results 11 - Check the zebra-output.log: Search biblios OK 0 1 1+0 RPN @attrset Bib-1 @attr 1=8009 'NFIC' 12 - Apply patch 13 - Restart all 14 - Repeat search by collection limit 15 - Success! 16 - Check the zebra-output.log: Search biblios OK 0 1 1+0 RPN @attrset Bib-1 @attr 1=8009 NFIC 17 - Add a new ccode value: N)N 18 - Set some items to that ccode 19 - Confirm searching by that ccode works Signed-off-by: Katrin Fischer Signed-off-by: Alex Arnaud Signed-off-by: Jonathan Druart (cherry picked from commit bc1b76be4a35403239fbce6f349ee343435cc8a0) Signed-off-by: Lucas Gass (cherry picked from commit 4733a2a4215c9351a398945ea2546542e4027d43) Signed-off-by: Aleisha Amohia commit df53ab009445f9ed96b2ef99dc5f0d046d16a96c Author: Nick Clemens Date: Wed Jul 15 15:33:18 2020 +0000 Bug 23086: Unit test Signed-off-by: Katrin Fischer Signed-off-by: Alex Arnaud Signed-off-by: Jonathan Druart (cherry picked from commit 40b6e1b8a1a6e74cb4e9a1c422ffa4faa0bdefc0) Signed-off-by: Lucas Gass (cherry picked from commit 1a6e51934df7f21f9b64f52606edb84180b5be2d) Signed-off-by: Aleisha Amohia ----------------------------------------------------------------------- Summary of changes: C4/Search.pm | 3 +-- t/db_dependent/Search.t | 8 +++++++- 2 files changed, 8 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Aug 4 03:02:45 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 04 Aug 2020 01:02:45 +0000 Subject: [koha-commits] main Koha release repository branch 19.11.x updated. v19.11.08-37-g54f653d270 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, 19.11.x has been updated via 54f653d2707a19b58aa0b6065e98f1280769afcd (commit) via aeb39a61bdef62a0cef6413b9cebcd60b83196f9 (commit) from fa08592991a875b81f5cc3c6bec555b0e5f866b8 (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 54f653d2707a19b58aa0b6065e98f1280769afcd Author: Aleisha Amohia Date: Fri Jul 31 03:39:32 2020 +1200 Bug 25709: DBRev 19.11.08.001 Signed-off-by: Aleisha Amohia commit aeb39a61bdef62a0cef6413b9cebcd60b83196f9 Author: Nick Clemens Date: Mon Jul 6 17:56:35 2020 +0000 Bug 25709: Rename systempreference to NotesToHide In an effort to use more inclusive language we have added a new coding guideline: https://wiki.koha-community.org/wiki/Coding_Guidelines#TERM3:_Inclusive_Language This patchset renames a syspref to be clearer and follow the guideline To test: 1 - Apply patch and updatedatabase 2 - git grep NotesBlacklist 3 - Note all remaining occurrences are translations, db updates, and release notes 4 - Add a field (e.g. '520' ) to the NotesToHide systempreference 5 - View a record with a 520 field on the opac 6 - Confirm the field does not show in the 'Title notes' tab Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit 5e45076c00b2f72537ba9c81c4535253f1aaadfb) Signed-off-by: Lucas Gass (cherry picked from commit f00ce94d94b079a9e8e326ea3bad99e5567d93f2) Signed-off-by: Aleisha Amohia ----------------------------------------------------------------------- Summary of changes: C4/Biblio.pm | 6 +++--- Koha.pm | 2 +- installer/data/mysql/sysprefs.sql | 2 +- installer/data/mysql/updatedatabase.pl | 7 +++++++ .../prog/en/modules/admin/preferences/cataloguing.pref | 2 +- t/Biblio/GetMarcNotes.t | 4 ++-- 6 files changed, 15 insertions(+), 8 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Aug 5 02:18:08 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 05 Aug 2020 00:18:08 +0000 Subject: [koha-commits] main Koha release repository branch 19.11.x updated. v19.11.08-38-gadf8e12eb1 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, 19.11.x has been updated via adf8e12eb132208d1401d150f1f0b77fca912c32 (commit) from 54f653d2707a19b58aa0b6065e98f1280769afcd (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 adf8e12eb132208d1401d150f1f0b77fca912c32 Author: Aleisha Amohia Date: Wed Aug 5 11:46:48 2020 +1200 Bug 25709: DBRev 19.11.08.001 - fixing output message ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/updatedatabase.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Aug 5 02:30:38 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 05 Aug 2020 00:30:38 +0000 Subject: [koha-commits] main Koha release repository branch 19.11.x updated. v19.11.08-40-g58e7d0b44a 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, 19.11.x has been updated via 58e7d0b44a85712e530b270f737f4de5f2b17ff7 (commit) via e0115e1572cf340d80f0d6b43c8121b419702999 (commit) from adf8e12eb132208d1401d150f1f0b77fca912c32 (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 58e7d0b44a85712e530b270f737f4de5f2b17ff7 Author: Aleisha Amohia Date: Wed Aug 5 12:00:37 2020 +1200 Bug 20882: DBIC Signed-off-by: Aleisha Amohia commit e0115e1572cf340d80f0d6b43c8121b419702999 Author: Aleisha Amohia Date: Wed Aug 5 11:55:20 2020 +1200 Bug 24640: DBIC Signed-off-by: Aleisha Amohia ----------------------------------------------------------------------- Summary of changes: Koha/Schema/Result/Deleteditem.pm | 18 +++++++----------- Koha/Schema/Result/Item.pm | 16 ++++++---------- Koha/Schema/Result/Quote.pm | 8 ++++---- 3 files changed, 17 insertions(+), 25 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Aug 5 02:39:00 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 05 Aug 2020 00:39:00 +0000 Subject: [koha-commits] main Koha release repository branch 19.11.x updated. v19.11.08-44-g493a0f2d54 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, 19.11.x has been updated via 493a0f2d540361ed4fef2157a9b852a1a57e126e (commit) via f6c6a07693f78a586078b50924a2fc2c6522087b (commit) via a2139daaa53acfa90d855a5e0df76b47fb964139 (commit) via f4899bafe35ad8e0c2e9af55068e6ee7f4a7e36e (commit) from 58e7d0b44a85712e530b270f737f4de5f2b17ff7 (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 493a0f2d540361ed4fef2157a9b852a1a57e126e Author: Jonathan Druart Date: Mon Jul 20 15:16:29 2020 +0200 Bug 24379: Fix failing tests kohadev-koha at kohadevbox:/kohadevbox/koha$ prove t/db_dependent/Koha/Patrons/Import.t t/db_dependent/Koha/Patrons/Import.t .. 2/159 # Failed test 'No warning raised by import_patrons' # at t/db_dependent/Koha/Patrons/Import.t line 171. # found warning: Argument "" isn't numeric in numeric eq (==) at /usr/share/perl5/DBIx/Class/Row.pm line 1018, <$handle_3a> line 2. # found warning: Argument "" isn't numeric in numeric eq (==) at /usr/share/perl5/DBIx/Class/Row.pm line 1018, <$handle_3a> line 2. # didn't expect to find a warning Argument "" isn't numeric in numeric eq (==) at /usr/share/perl5/DBIx/Class/Row.pm line 1018, <$handle_2> line 2. Argument "" isn't numeric in numeric eq (==) at /usr/share/perl5/DBIx/Class/Row.pm line 1018, <$handle_2> line 2. Argument "" isn't numeric in numeric eq (==) at /usr/share/perl5/DBIx/Class/Row.pm line 1018, <$handle_3> line 2. Argument "" isn't numeric in numeric eq (==) at /usr/share/perl5/DBIx/Class/Row.pm line 1018, <$handle_3> line 2. Argument "" isn't numeric in numeric eq (==) at /usr/share/perl5/DBIx/Class/Row.pm line 1018, <$handle_4> line 2. Argument "" isn't numeric in numeric eq (==) at /usr/share/perl5/DBIx/Class/Row.pm line 1018, <$handle_4> line 2. t/db_dependent/Koha/Patrons/Import.t .. 152/159 # Looks like you failed 1 test of 159. t/db_dependent/Koha/Patrons/Import.t .. Dubious, test returned 1 (wstat 256, 0x100) Failed 1/159 subtests Test Summary Report ------------------- t/db_dependent/Koha/Patrons/Import.t (Wstat: 256 Tests: 159 Failed: 1) Failed test: 39 Non-zero exit status: 1 Files=1, Tests=159, 3 wallclock secs ( 0.04 usr 0.01 sys + 2.11 cusr 0.24 csys = 2.40 CPU) Result: FAIL Signed-off-by: Jonathan Druart (cherry picked from commit 545e03c173c789241eb21773a939b4ab7dcc6da4) Signed-off-by: Lucas Gass (cherry picked from commit c0e665aeccbc028f4289e7b1c144f844c05b5198) Signed-off-by: Aleisha Amohia commit f6c6a07693f78a586078b50924a2fc2c6522087b Author: Aleisha Amohia Date: Wed Aug 5 12:08:00 2020 +1200 Bug 24379: DBIC Signed-off-by: Aleisha Amohia commit a2139daaa53acfa90d855a5e0df76b47fb964139 Author: Aleisha Amohia Date: Wed Aug 5 12:07:40 2020 +1200 Bug 24379: DBRev 19.11.08.002 Signed-off-by: Aleisha Amohia commit f4899bafe35ad8e0c2e9af55068e6ee7f4a7e36e Author: Nick Clemens Date: Wed Jan 8 20:59:38 2020 +0000 Bug 24379: Make login_attempts not nullable While the column defaults to 0 in Koha::Object->store we set to NULL if NULLABLE When trying to reset a patrons password we check that the account is not administratively locked: login_attempts != -1 This query does not return rows where login_attempts IS NULL. It will return accounts where login_attempts = 0 Let's default to 0 like we intend To test: 1 - Create a new patron 2 - Note their login_attempts is NULL SELECT login_attempts FROM borrowers ORDER BY borrowernumber DESC LIMIT 1 3 - Enable OpacResetPassword 4 - Attempt to reset password before logging in, you cannot 5 - Apply patch, updatedatabase, restart_all, update schema 6 - Create another patron 7 - Their login attempts should be 0 8 - Attempt to reset password, it works! Bug 24379: Fix the test First we create a patron using TestBuilder to get a hashref of valid info. Then we delete it and create a new patron using Koha::Patron->new Once stored, we should call discard_changes to make the calculated values available in the currenct object. Bug 24379: Don't drop default of 0 for login attempts When moving the column we drop the default, this means that DBs upgraded form earlier versions get the wrong values set To test: 1 - Checkout 16.11.x 2 - Reset all 3 - Checkout master 4 - updatedatabase 5 - SHOW CREATE TABLE borrowers; 6 - Note the column login_attempts defaults to NULL 7 - Apply patch(es) 8 - Repeat 9 - Now it defaults ot 0 (and has NOT NULL if applied all) Signed-off-by: Lucas Gass Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit 7bb31cffae27dc398a7b4a4decf3623ec65478ac) Signed-off-by: Lucas Gass (cherry picked from commit 6d675b61ad2dfd8fa6cfd0f58a9ebb8d534bd358) Signed-off-by: Aleisha Amohia ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- Koha/Patrons/Import.pm | 2 +- Koha/Schema/Result/Borrower.pm | 8 ++++---- Koha/Schema/Result/Deletedborrower.pm | 8 ++++---- installer/data/mysql/kohastructure.sql | 4 ++-- installer/data/mysql/updatedatabase.pl | 14 ++++++++++++-- t/db_dependent/Koha/Patron.t | 21 ++++++++++++++++++++- 7 files changed, 44 insertions(+), 15 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Aug 5 10:50:15 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 05 Aug 2020 08:50:15 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v20.05.00-484-gc34d222d57 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 c34d222d57c61c60dcfb9babc16be8827bb7e242 (commit) from 3b24ca4ebb10bee1212d2c133c1d0259bec56d44 (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 c34d222d57c61c60dcfb9babc16be8827bb7e242 Author: Jonathan Druart Date: Mon Aug 3 17:57:02 2020 +0200 Bug 25811: Try to fix the random failure caused by not finding id=login Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: t/db_dependent/selenium/authentication.t | 1 + 1 file changed, 1 insertion(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Aug 5 18:05:39 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 05 Aug 2020 16:05:39 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v20.05.00-492-ge4cae99f7e 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 e4cae99f7ec76e40a57e4066e088b9b01caed744 (commit) via d20bc39d759bc9321b1b7accb952f90351a14caa (commit) via 61e8dc8c7d489329c27aca3b6b10137c289161cb (commit) via 88ecaa54cdfec5d35091237821097877b0edb4eb (commit) via 5c190388ae1b69889e28c2dae80e0d9ea9baff1a (commit) via a51a4f117d13739687f7be47d56cae0352914901 (commit) via 80a611797bf67b263b6b84a6e931833ea336b6a5 (commit) via 88506d7bb6958a49969f737a8bc41afa8536c554 (commit) from c34d222d57c61c60dcfb9babc16be8827bb7e242 (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 e4cae99f7ec76e40a57e4066e088b9b01caed744 Author: Tomas Cohen Arazi Date: Wed Aug 5 12:09:40 2020 -0300 Bug 26143: Make the API handle per_page=-1 This patch introduces handling for per_page=-1 and actually adds a missing feature to the API: being able to request all resources on a route. To test this: 1. Visit the libraries admin page 2. On the table, choose to display 'All' rows => FAIL: it doesn't refresh, the browser console displays a 500 error code and so the logs 3. Apply the tests patches 4. Run: $ kshell k$ prove t/Koha/REST/Plugin/Pagination.t \ t/db_dependent/Koha/REST/Plugin/Objects.t => FAIL: Tests fail loudly 5. Apply this patch 6. Restart plack 7. Repeat 2 => SUCCESS: choosing to display all, works 8. Repeat 4 => SUCCESS: Tests pass now! 9. Sign off :-D Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit d20bc39d759bc9321b1b7accb952f90351a14caa Author: Tomas Cohen Arazi Date: Wed Aug 5 12:04:47 2020 -0300 Bug 26143: Regression tests This patch introduces tests for the per_page=-1 handling use case. From now on per_page=-1 means 'all resources'. On writing this I noticed that we always paginate results no matter what, but there was a weird condition under which on pagination headers were sent back to the API consumer. This is highlighted in the precedent patch, which is not the -1 situation this one tries to tackle. Both pagination and searching are broken with per_page=-1, which is a standard, and we actually didn't explicitly set a way to request all resources. To verify this: 1. Apply the previous tests patch and this one 2. Run: $ kshell k$ prove t/Koha/REST/Plugin/Pagination.t \ t/db_dependent/Koha/REST/Plugin/Objects.t => FAIL: Things are damn broken Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 61e8dc8c7d489329c27aca3b6b10137c289161cb Author: Tomas Cohen Arazi Date: Wed Aug 5 11:55:28 2020 -0300 Bug 26143: The API is always paginated Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 88ecaa54cdfec5d35091237821097877b0edb4eb Author: Jonathan Druart Date: Tue Aug 4 13:55:13 2020 +0200 Bug 26133: Remove GetMarcHosts We removed the single occurrence of this subroutine in the previous patch Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart commit 5c190388ae1b69889e28c2dae80e0d9ea9baff1a Author: Jonathan Druart Date: Tue Aug 4 13:54:28 2020 +0200 Bug 26133: Remove GetMarc* calls in detail.pl There are several calls in catalogue/detail.pl that can be removed: GetMarcISBN, GetMarcAuthors, GetMarcSubjects, GetMarcSeries, GetMarcUrls and GetMarcHosts They pass a variable to the template that is never used. Test plan: Confirm that this TT variable is never used. Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart commit a51a4f117d13739687f7be47d56cae0352914901 Author: Jonathan Druart Date: Wed Aug 5 09:57:56 2020 +0200 Bug 26141: Remove duplicated code from search.pl commit 417553a9e47bf31f4cb785162e3dced856a2ac2a Bug 12478: starting to add search to staff client This commit added code related to the itemtypes to the advanced search, but this code already existed. The weird bit is: $template->param(advancedsearchesloop => \@advancedsearchesloop); my $types = C4::Context->preference("AdvancedSearchTypes") || "itemtypes"; my $advancedsearchesloop = prepare_adv_search_types($types); $template->param(advancedsearchesloop => $advancedsearchesloop); We are passing twice advancedsearchesloop to the template. Test plan (for QA): Review the changes and confirm that we can safely remove this code Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart commit 80a611797bf67b263b6b84a6e931833ea336b6a5 Author: Jonathan Druart Date: Wed Jul 22 14:11:03 2020 +0200 Bug 26043: Fix random failure from Holds.t # Failed test 'Test ModReserveMinusPriority()' # at t/db_dependent/Holds.t line 202. # got: undef # expected: '1605' # Looks like you failed 1 test of 66. It is coming from Koha::Patron->holds that is ordering by reservedate, so "sometimes" they are ordered in reverse (at least it's my understanding of the problem). Test plan: Run the test file several times (from 20 to 60x), it must never fail with this patch Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart commit 88506d7bb6958a49969f737a8bc41afa8536c554 Author: Jonathan Druart Date: Wed Aug 5 09:30:31 2020 +0200 Bug 26138: Make Koha::Plugins->call return consistent value It must return an empty array in case the enable_plugins config flag is disabled Test plan: Turn the config off in koha-conf Start a search at the OPAC Without this patch you got: Can't use string ("0") as a HASH ref while "strict refs" in use at /home/vagrant/kohaclone/opac/opac-search.pl line 661 With this patch applied you see the search result Followed test plan - works as described. Signed-off-by: Alex Buckley Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: C4/Biblio.pm | 48 ---------------------- Koha/Plugins.pm | 4 +- Koha/REST/Plugin/Objects.pm | 22 ++++++---- Koha/REST/Plugin/Pagination.pm | 22 +++++----- catalogue/detail.pl | 12 ------ catalogue/search.pl | 46 --------------------- opac/opac-detail.pl | 2 - t/Biblio.t | 8 +--- t/Koha/REST/Plugin/Pagination.t | 67 +++++++++++++++++++++++++++++-- t/db_dependent/Holds.t | 2 +- t/db_dependent/Koha/Plugins/Plugins.t | 8 +++- t/db_dependent/Koha/REST/Plugin/Objects.t | 14 ++++++- 12 files changed, 114 insertions(+), 141 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Aug 6 12:06:52 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 06 Aug 2020 10:06:52 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v20.05.00-508-g5bad8da970 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 5bad8da970b299588b49ca061555e1633f95a6fe (commit) via e1509855d3aa2729127ac352525be62505d752f9 (commit) via c7ae33f60c18d2874370e7c2d2f3042fe1331e0e (commit) via 09146f4a995d50206c7f1c2d80e797b3cb1175c5 (commit) via 759e52ac944d25cf019b83a68ea0329842e4d3e2 (commit) via 8855908fdf8839878a233012f4d63b33949554c0 (commit) via b6cb3c2ba54c0e10c27f37a0d2dec4f2875f2ddd (commit) via 1ae7efa3bb7806ac5a7e3f2882a7139e627b22c6 (commit) via ff4917197deaa6250d30c5729b2758db2b1f755e (commit) via e0624f0e03e8d265cd3f2ab8434671700bf6984d (commit) via bb0abf99c451113e8649c494d3a8b99f3916f942 (commit) via 6d1c3af91bec4e5f93f6531be3aa8de4c4608efe (commit) via 550cb7eb431fe90c9cd1d7f9f711f617d0befe6e (commit) via 6a55ca6a82a662966e47921e13029a91152fbefd (commit) via 2b5f66ddbb9b556933baedd6f471b97eca713d8d (commit) via 19d8aea4e04d64426493c16681dfa662313e4cee (commit) from e4cae99f7ec76e40a57e4066e088b9b01caed744 (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 5bad8da970b299588b49ca061555e1633f95a6fe Author: Owen Leonard Date: Mon Jul 27 12:26:41 2020 +0000 Bug 26037: openlibrary.org is hit on every Koha requests This patch moves the inclusion of Open Library JavaScript from opac-bottom.inc to the three templates where it might be used. In addition, the Open Library JS has been modified to check for the existence of the relevant markup on the page before executing a query. Unrelated: The Open Library label is now hidden when the status returned is "Not found." Previously this information was displayed. To test, apply the patch and enable the OpenLibrarySearch system preference. - Perform a search in the OPAC which will return results from Open Library. Some ISBNs: 0140423826, 0395082552, 0679436405. - On the search result page there should be an Open Library "Read now" button for each result that can be opened for reading in Open Library. - Add these titles to a list and view the list. - The "Read now" button should appear on the list page. - View the details for one of these titles. - The "Read now" button should appear on the page below the holdings. - Watch the browser's developer tools on these and other pages in the OPAC. There should be no errors in the console and no 404 errors in the network tab. Signed-off-by: Lucas Gass Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit e1509855d3aa2729127ac352525be62505d752f9 Author: Nick Clemens Date: Tue Aug 4 18:28:42 2020 +0000 Bug 25683: (follow-up) Use COALESCE instead of IFNULL Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart commit c7ae33f60c18d2874370e7c2d2f3042fe1331e0e Author: Nick Clemens Date: Wed Jun 10 12:26:06 2020 +0000 Bug 25683: Fix grouping of results DBIX doesn't seem to work as I expected - if trying to group by we can only get the columns we grouped by, otherwise the queries are much more complicated and come out wrong This patch removes the 'amountoutstanding' from the query. Note that we do return patron object, however, to access all the columns we must discard_changes (or refetch) Also fixes a typo 'verbosse' To test: 1 - charge a $1 fine to a patron 2 - pay off the fine 3 - perl misc/cronjobs/update_patrons_category.pl -f J -t J -fu=5 -v 4 - Note the patron is returned twice 5 - export DBIC_TRACE=1 6 - repeat 3 - view the SQL query and see how odd it is 7 - Apply this patch 8 - repeat 3 - simpler query 9 - patron returned only once Signed-off-by: David Nind Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart commit 09146f4a995d50206c7f1c2d80e797b3cb1175c5 Author: Nick Clemens Date: Tue Jun 9 10:52:26 2020 +0000 Bug 25683: Patron with no accountlines should have 0 outstanding (not NULL) Test plan: - Have a patron with nothing in accountlines - run update_patron_categories to find patrons with fines under $5 (-fu=5) - Your patron is not found - Give your patron a manual charge of $1 - rerun the cron, your patron is found - pay off your patron's fine, putting their balance at $0 - rerun the cron, your patron is found Signed-off-by: David Nind Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart commit 759e52ac944d25cf019b83a68ea0329842e4d3e2 Author: Lucas Gass Date: Mon Aug 3 21:56:48 2020 +0000 Bug 26131: Remove parentheses in circulation.pref To test: 1. Search for a SCO system preference like SCOUserJS. 2. Note that there is a console error on that screen and you cannot open editor. 3. Apply patch 4. Reload the page. 5. No more console error and you can now edit the system pref! Signed-off-by: Sally Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 8855908fdf8839878a233012f4d63b33949554c0 Author: Didier Gautheron Date: Mon Aug 3 08:40:06 2020 +0200 Bug 26125: (bug 23697 follow-up) open patron's details in autocompletion search Test plan: 1 - Enable PatronAutoComplete syspref 2 - Go to "Patrons" (members/members-home.pl) 3 - Enter a patron first letters in "Search Patron" tab 4 - Select a patron 5 - You're wrongly redirected in koha/circ/circulation.pl 6 - Apply patch 7 - Repeat 3, 4 8 - You're correctly redirected in koha/members/moremember.pl 9 - double check "Check out" redirect hasn't changed Signed-off-by: Sally Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit b6cb3c2ba54c0e10c27f37a0d2dec4f2875f2ddd Author: Jonathan Druart Date: Thu Jul 30 10:51:26 2020 +0200 Bug 26098: Fix JS error on the fund list view when no fund displayed TypeError: this.data(...) is undefined in jquery.treetable.js Test plan: Go to the fund list view Select a filter that will return no result => With this patch applied there is no JS error in the console Signed-off-by: Lucas Gass Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 1ae7efa3bb7806ac5a7e3f2882a7139e627b22c6 Author: Martin Renvoize Date: Tue Aug 4 15:06:02 2020 +0100 Bug 26017: (follow-up) Serverside permission check on registers page This patch adds a serverside permissions check for the display of the registers summary page. Signed-off-by: Jonathan Druart commit ff4917197deaa6250d30c5729b2758db2b1f755e Author: Martin Renvoize Date: Mon Jul 20 09:40:00 2020 +0100 Bug 26017: Correct permission check on tools page The 'Cashup registers' link from the tools page retained an previous verions of the permission name. This patch corrects it to use the final name we sebtled on and thus now correctly displays the link when appropriate. Test plan 1/ Enable cash registers via the 'UseCashRegisters' system preference 2/ Ensure you are logged in as a user who has the cash management cashup permission. 3/ Verify that the 'Cashup registers' option appears on the tools page. Signed-off-by: Michal Denar Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit e0624f0e03e8d265cd3f2ab8434671700bf6984d Author: Lucas Gass Date: Fri Jul 31 22:47:21 2020 +0000 Bug 26121: Add z-index for CodeMirror To test: 1. Make sure the system preference 'NewsToolEditor' is set to CodeMirror 2. Go add or edit some News content. 3. Add some content to the News section 4. Use the datepicker to pick a Publication date/Expiration date 5. Notice its very hard to see your dates overlapping with CodeMirror. 6. Apply patch 7. Much easier to see the dates! Signed-off-by: Sally Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit bb0abf99c451113e8649c494d3a8b99f3916f942 Author: Nick Clemens Date: Mon Jun 29 18:15:39 2020 +0000 Bug 25893: Use wildcards when searching logs The restores the wildcards that were used in the past To test: 0 - Ensure cataloguing logs and issues logs are enabled 1 - Edit an item 2 - Circulate that same item 3 - Browse to tools-> log viewer 4 - Put the itemnumber in the 'info' box 5 - You see only the circulation 6 - Put the itemnumber in the object box 7 - You see only the cataloging modification 8 - Apply patch 9 - Put itemnumber in info box 10 - you see both actions 11 - Put the itemnumber in the object box 12 - You see only the catalogiong modification Signed-off-by: Jason Robb Bug 25893: Don't wildcard object Signed-off-by: Katrin Fischer Bug 25893: (follow-up) Undo unrelated changes Signed-off-by: Jonathan Druart commit 6d1c3af91bec4e5f93f6531be3aa8de4c4608efe Author: Lucas Gass Date: Tue Aug 4 02:59:32 2020 +0000 Bug 26124: Load TinyMCE assets in correct order 1. Make sure NewsToolEditor is set to TinyMCE 2. Go to Home › Tools › News › Add news item 3. Observe console error 4. Apply patch 5. No console error Signed-off-by: Sally Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 550cb7eb431fe90c9cd1d7f9f711f617d0befe6e Author: Tomas Cohen Arazi Date: Fri Jul 31 10:17:01 2020 -0300 Bug 26115: Remove leftover Carp::Always Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart commit 6a55ca6a82a662966e47921e13029a91152fbefd Author: Jonathan Druart Date: Thu Aug 6 11:36:33 2020 +0200 Bug 25871: DBRev 20.06.00.021 Signed-off-by: Jonathan Druart commit 2b5f66ddbb9b556933baedd6f471b97eca713d8d Author: Nick Clemens Date: Tue Aug 4 00:49:35 2020 +0000 Bug 25871: (QA follow-up) Update syspref Signed-off-by: Jonathan Druart commit 19d8aea4e04d64426493c16681dfa662313e4cee Author: Owen Leonard Date: Tue Jun 16 21:34:52 2020 +0000 Bug 25871: Add "only library" to OpacItemLocation options This patch adds a new option to the OpacItemLocation system preference, "only library." It also rewords the descriptions of the existing options in order to make their use more clear. To test, apply the patch and make sure your OPACXSLTResultsDisplay system preference is set to "default." Test the OPAC search results using each of the OpacItemLocation preference options: - location: "library, location, and call number," e.g. "Availability: Items available for loan: Athens (1). Location(s): Athens new book shelf Call number: JNF 952.025 Bl." - ccode: "library, collection code, and call number," e.g. "Availability: Items available for loan: Athens (1). Collection(s): Juvenile non-fiction Call number: JNF 952.025 Bl." - callnum: "library and call number," e.g. "Availability: Items available for loan: AthensCall number: JNF 952.025 Bl (1)." - library: "only library," e.g." "Availability: Items available for loan: Athens (1)." Signed-off-by: Amit Gupta Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- Koha/Patrons.pm | 6 +- installer/data/mysql/sysprefs.sql | 2 +- installer/data/mysql/updatedatabase.pl | 9 ++ .../intranet-tmpl/prog/en/includes/js_includes.inc | 2 +- .../prog/en/modules/admin/aqbudgets.tt | 126 +++++++++++---------- .../en/modules/admin/preferences/circulation.pref | 4 +- .../prog/en/modules/admin/preferences/opac.pref | 7 +- .../prog/en/modules/tools/koha-news.tt | 3 +- .../prog/en/modules/tools/tools-home.tt | 6 +- .../bootstrap/en/includes/opac-bottom.inc | 14 +-- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 3 + .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 7 +- .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 4 + .../bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 6 +- koha-tmpl/opac-tmpl/bootstrap/js/openlibrary.js | 25 ++-- misc/cronjobs/update_patrons_category.pl | 9 +- pos/registers.pl | 1 + t/db_dependent/Illrequests.t | 1 - t/db_dependent/Patrons.t | 9 +- tools/viewlog.pl | 5 +- 21 files changed, 139 insertions(+), 112 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Aug 6 22:28:25 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 06 Aug 2020 20:28:25 +0000 Subject: [koha-commits] main Koha release repository branch 20.05.x updated. v20.05.02-115-g43aa7f36bf 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, 20.05.x has been updated via 43aa7f36bf40692e2f71ebea6b122079a73522bd (commit) from 55a24f880d69ed6627e8dc4cbc429d0eb167c96e (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 43aa7f36bf40692e2f71ebea6b122079a73522bd Author: Mason James Date: Fri Jul 3 23:42:02 2020 +1200 Bug 25920: Add liblocale-codes-perl package to fix ubuntu-stable (focal) to test on ubuntu-20... 1/ install koha-common pkg $ sudo apt install koha-common 2/ confirm liblocale-codes-perl pkg is not installed :( $ apt-cache policy liblocale-codes-perl | grep Installed Installed: (none) 3/ apply patch 4/ build and install new koha-common pkg 5/ confirm liblocale-codes-perl pkg is now installed :) $ apt-cache policy liblocale-codes-perl | grep Installed Installed: 3.62-1 Signed-off-by: Martin Renvoize Signed-off-by: Joonas Kylmälä Signed-off-by: Jonathan Druart (cherry picked from commit 58be086a18e39068fd12dfeef677f982ae735a73) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: debian/control | 2 ++ debian/list-deps | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Aug 6 22:32:55 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 06 Aug 2020 20:32:55 +0000 Subject: [koha-commits] main Koha release repository branch 20.05.x updated. v20.05.02-116-g6ad9baace2 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, 20.05.x has been updated via 6ad9baace2099650a14c0ee478130ca3c01c673a (commit) from 43aa7f36bf40692e2f71ebea6b122079a73522bd (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 6ad9baace2099650a14c0ee478130ca3c01c673a Author: Katrin Fischer Date: Sat May 23 01:12:22 2020 +0200 Bug 25499: Fix fund code column when closing a budget When closing a budget the fund code column in the table is always empty. This is due to a TT variable not being correct. To test: - Create a budget and fund - Order anything, leave basket open or not, but don't receive - Duplicate your existing budget - Close the first budget in order to move the pending orders - Verify the fund code is not showing in the table - Apply patch and reload the patch - Verify fund codes are now showing correctly Bonus: Changes the column heading Fund id to Fund ID. Signed-off-by: Abbey Holt Signed-off-by: Joonas Kylmälä Signed-off-by: Jonathan Druart (cherry picked from commit ab015f04dcd4956ca1ccd610d085e8b0c17ca733) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Aug 6 22:36:35 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 06 Aug 2020 20:36:35 +0000 Subject: [koha-commits] main Koha release repository branch 20.05.x updated. v20.05.02-117-gfe19488c22 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, 20.05.x has been updated via fe19488c2299c46fc50608d15bb30017cd720ec5 (commit) from 6ad9baace2099650a14c0ee478130ca3c01c673a (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 fe19488c2299c46fc50608d15bb30017cd720ec5 Author: Jonathan Druart Date: Tue Jul 28 09:23:35 2020 +0200 Bug 21268: Don't remove 0 allocated funds from fund list If a fund is created with a amount of 0, it will not appear in the fund list (when a new order is created for instance). 0 allocated funds can be used to track donations and other situations where there is not an expected amount for the year. Test plan: 0. Do not apply the patch 1. Create 1 active and 1 inactive budgets 2. Create some funds for each budgets, with amount > 0 and amount == 0 3. Add orders to basket => Note that the funds with amount == 0 are not displayed 4. Apply the patch 5. Add orders to basket (using the different possible ways we have) => Note that the funds with amount == 0 are displayed This change is applied to the different views of the acquisition module. Signed-off-by: Andrew Fuerste-Henry Signed-off-by: Joonas Kylmälä Signed-off-by: Jonathan Druart (cherry picked from commit 8ecaedc22db5a25db6ffa98e6a7fc2e7039656c7) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: acqui/addorderiso2709.pl | 3 --- acqui/basket.pl | 3 --- acqui/booksellers.pl | 3 --- acqui/duplicate_orders.pl | 4 +--- acqui/invoice.pl | 4 ---- acqui/neworderempty.pl | 3 --- acqui/orderreceive.pl | 3 --- acqui/parcels.pl | 3 --- 8 files changed, 1 insertion(+), 25 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Aug 6 22:40:39 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 06 Aug 2020 20:40:39 +0000 Subject: [koha-commits] main Koha release repository branch 20.05.x updated. v20.05.02-118-g46710cfc00 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, 20.05.x has been updated via 46710cfc0018d7107a68a1e6da847262bfb2470c (commit) from fe19488c2299c46fc50608d15bb30017cd720ec5 (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 46710cfc0018d7107a68a1e6da847262bfb2470c Author: Owen Leonard Date: Thu Jun 18 13:10:35 2020 +0000 Bug 25351: Move cart-related strings out of opac-bottom.inc and into basket.js This patch adds the necessary JavaScript includes to the OPAC to enable translation of strings in JavaScript. It also updates the translation of cart-related strings by removing the strings from opac-bottom.inc and putting them in basket.js where they are used. To test, apply the patch and test that the correct strings are translatable. In this example I'm testing fr-FR: - Update a translation: > cd misc/translator > perl translate update fr-FR - Open the corresponding .po file for the strings pulled from JavaScript e.g. misc/translator/po/fr-FR-messages-js.po - Locate strings pulled from bootstrap/js/basket.js for translation, e.g.: #: koha-tmpl/opac-tmpl/bootstrap/js/basket.js:89 msgid "Your cart is currently empty" msgstr "" - Edit the "msgstr" string however you want (it's just for testing) - Install the updated translation: > perl translate install fr-FR In the OPAC, switch to the language you're testing. Confirm that your translated string appears. In the above example, by clicking the "Cart" icon in the header when there are no items in the cart. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit 7c8276bf0e64a2dc90af4aab0d6e78893edc12b1) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: .../bootstrap/en/includes/doc-head-close.inc | 8 ++++ .../bootstrap/en/includes/opac-bottom.inc | 15 +------- koha-tmpl/opac-tmpl/bootstrap/js/basket.js | 44 +++++++++++----------- 3 files changed, 31 insertions(+), 36 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Aug 6 22:44:39 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 06 Aug 2020 20:44:39 +0000 Subject: [koha-commits] main Koha release repository branch 20.05.x updated. v20.05.02-119-g549cc995b2 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, 20.05.x has been updated via 549cc995b2796b9e413c2860fe2d09fef5d97778 (commit) from 46710cfc0018d7107a68a1e6da847262bfb2470c (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 549cc995b2796b9e413c2860fe2d09fef5d97778 Author: Didier Gautheron Date: Sun Jul 12 14:09:15 2020 +0200 Bug 25982: OPAC shelves RSS link output is xml Output rss feed as text/xml Test plan: 1) have books entered 2) log in create a list 3) add books to list 4) display list in OPAC 5) click the RSS link button. -- output is displayed as html text 6) apply patch 7) repeat steps 4&5 -- output is displayed as xml tree Signed-off-by: Sally Signed-off-by: Amit Gupta Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit 3d0da68d5ada37b40099fbc11b63202ccf7a48b2) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: opac/opac-shelves.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Aug 6 22:50:42 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 06 Aug 2020 20:50:42 +0000 Subject: [koha-commits] main Koha release repository branch 20.05.x updated. v20.05.02-120-g10d515257c 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, 20.05.x has been updated via 10d515257c0c68a4ca07c8ab8108068ded1298e0 (commit) from 549cc995b2796b9e413c2860fe2d09fef5d97778 (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 10d515257c0c68a4ca07c8ab8108068ded1298e0 Author: Owen Leonard Date: Fri Jul 10 13:19:14 2020 +0000 Bug 25968: Make logs sort by date descending as a default This patch adds DataTables with columns configuration to the log viewer. The table of log entries is now sorted by default by date descending. To test, apply the patch and go to Administration -> Table settings. - Expand the "Tools" section and confirm that there is a section for "logviewer." - Go to Tools -> Log viewer. - Perform a search which will return multiple results. - Confirm that the results are sorted by date descending. - Test that the table controls work correctly: Paging, columns, export. - Return to the Table settings administration page and test that changes to those settings are correctly reflected in the log viewer table. Signed-off-by: barbara Signed-off-by: Katrin Fischer JD amended patch: Fix indentation in .yml to match other entries Signed-off-by: Jonathan Druart (cherry picked from commit e68fe2a928bec05b9602fa28dfbc86e04657ce81) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: admin/columns_settings.yml | 17 +++++++++++++++++ .../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 12 +++++++++--- koha-tmpl/intranet-tmpl/prog/js/viewlog.js | 6 ++++++ 3 files changed, 32 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Aug 6 23:01:24 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 06 Aug 2020 21:01:24 +0000 Subject: [koha-commits] main Koha release repository branch 20.05.x updated. v20.05.02-125-g1d08b9fdc9 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, 20.05.x has been updated via 1d08b9fdc9abfa57bf3916545cd62ffbeced6530 (commit) via 5b6756a3e69027c7b903a2d9107a4d188ca5f84d (commit) via f659b89d3ec253ab0e7d6addf8309bedb1fac592 (commit) via fa7f9049cae584c5065e9a84b360aa6256540b42 (commit) via fb0c35650c59a9bbe420d016a3f169b71c578fee (commit) from 10d515257c0c68a4ca07c8ab8108068ded1298e0 (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 1d08b9fdc9abfa57bf3916545cd62ffbeced6530 Author: Lucas Gass Date: Thu Aug 6 20:28:34 2020 +0000 Bug 22660: DBrev 20.05.02.009 Signed-off-by: Lucas Gass commit 5b6756a3e69027c7b903a2d9107a4d188ca5f84d Author: Katrin Fischer Date: Wed Jul 29 22:51:34 2020 +0000 Bug 22660: (QA follow-up) Fix capitalization in system preference Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit 9e0d097a5692af07db020e6f806eeaa97d43ae1e) Signed-off-by: Lucas Gass commit f659b89d3ec253ab0e7d6addf8309bedb1fac592 Author: Owen Leonard Date: Thu Jul 23 18:20:51 2020 +0000 Bug 22660: (follow-up) Re-word system preference description This patch rewords the system preference description to focus on the generic description of the editor rather than the name of the plugin: tinymce: "a WYSIWYG editor (TinyMCE)" codemirror: "a text editor (CodeMirror)" Signed-off-by: Lisette Scheer Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit 23846781751d7fb808b3fa4b857da72706653575) Signed-off-by: Lucas Gass commit fa7f9049cae584c5065e9a84b360aa6256540b42 Author: Owen Leonard Date: Thu Jul 23 17:58:22 2020 +0000 Bug 22660: (follow-up) Improve asset handling, add linting This patch makes some changes to the way assets are included based on the value of the system preferece in order to minimize unnecessary JavaScript includes. The patch also adds HTML syntax-highlighting and linting like we have in the system preferences editor. Removed are two JS files which were not required. To test, apply the patch and set the NewsToolEditor preference to "CodeMirror." - Edit a news item and confirm that the contents of the editor show HTML syntax highlighting. - Test HTML linting by adding some malformed HTML (missing closing tag, for instance). The error should be highlighted. - Set the NewsToolEditor to "TinyMCE" and confirm that WYSIWYG editing still works correctly. https://bugs.koha-community.org/show_bug.cgi?id=22600 Signed-off-by: Lisette Scheer Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit 5bec404420c6dd9251b511d12e2425e5a6039a95) Signed-off-by: Lucas Gass commit fb0c35650c59a9bbe420d016a3f169b71c578fee Author: Lucas Gass Date: Fri May 8 22:57:40 2020 +0000 Bug 22660: Add system pref to allow switching of editors in News Tool This patch adds a system preference called 'NewsToolEditor' which allows for the choice between TinyMCE and CodeMirror in the News Feature. TEST PLAN: 1. Apply patch and run updatedatabase 2. Go to Tools > News and make a new entry or edit an existing News item. 3. When you initially load you should gte the TinyMCE editor (WYSIWYG) 4. Search for the NewsToolEditor system preference and switch to CodeMirror. 5. Reload your News item and now you should see the CodeMirror editor. 6. Try saving content with both and maki sure it works. 7. Try adding some different HTML tags in CodeMirror mode, saving, and making sure it looks right when you switch back to TinyMCE Signed-off-by: Owen Leonard Signed-off-by: Lisette Scheer Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit 980dd605031e616f1d481852dffe9cc6779eb3e3) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- installer/data/mysql/sysprefs.sql | 1 + installer/data/mysql/updatedatabase.pl | 7 +++ .../prog/en/modules/admin/preferences/tools.pref | 8 ++- .../prog/en/modules/tools/koha-news.tt | 70 +++++++++++++++------- 5 files changed, 66 insertions(+), 22 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Aug 6 23:17:09 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 06 Aug 2020 21:17:09 +0000 Subject: [koha-commits] main Koha release repository branch 20.05.x updated. v20.05.02-127-g20282d0af3 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, 20.05.x has been updated via 20282d0af36cd0424a896380392777b29315b55a (commit) via cde498344dcb2739bd703b53bdbcdf728d5b5f0a (commit) from 1d08b9fdc9abfa57bf3916545cd62ffbeced6530 (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 20282d0af36cd0424a896380392777b29315b55a Author: Lucas Gass Date: Thu Aug 6 20:45:36 2020 +0000 Bug 26070: DBRev 20.05.02.010 Signed-off-by: Lucas Gass commit cde498344dcb2739bd703b53bdbcdf728d5b5f0a Author: Owen Leonard Date: Mon Jul 27 19:16:07 2020 +0000 Bug 26070: Remove GoogleIndicTransliteration system preference The Google Transliterate API was deprecated on May 26, 2011. This patch removes the feature and associated system preference. To test, apply the patch and run the database update process. - Go to Administration -> System preferences and search for 'GoogleIndicTransliteration.' There should be no results. - Search the Koha codebase for references to 'GoogleIndicTransliteration.' There should be no current references.. Signed-off-by: Amit Gupta Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit 9b9e8fd32852acceb10cfc54d4a5a3acc0f6e232) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- installer/data/mysql/sysprefs.sql | 1 - installer/data/mysql/updatedatabase.pl | 9 ++++++++ .../prog/en/modules/admin/preferences/opac.pref | 7 ------ .../bootstrap/en/includes/opac-bottom.inc | 4 ---- .../bootstrap/js/googleindictransliteration.js | 27 ---------------------- opac/opac-main.pl | 5 ---- opac/opac-search.pl | 5 ---- 8 files changed, 10 insertions(+), 50 deletions(-) delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/js/googleindictransliteration.js hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Aug 7 04:11:53 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 07 Aug 2020 02:11:53 +0000 Subject: [koha-commits] main Koha release repository branch 19.11.x updated. v19.11.08-45-gf19e6015b0 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, 19.11.x has been updated via f19e6015b0c76b765b5e81a43fb103bcc846bbdf (commit) from 493a0f2d540361ed4fef2157a9b852a1a57e126e (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 f19e6015b0c76b765b5e81a43fb103bcc846bbdf Author: Mason James Date: Fri Jul 3 23:42:02 2020 +1200 Bug 25920: Add liblocale-codes-perl package to fix ubuntu-stable (focal) to test on ubuntu-20... 1/ install koha-common pkg $ sudo apt install koha-common 2/ confirm liblocale-codes-perl pkg is not installed :( $ apt-cache policy liblocale-codes-perl | grep Installed Installed: (none) 3/ apply patch 4/ build and install new koha-common pkg 5/ confirm liblocale-codes-perl pkg is now installed :) $ apt-cache policy liblocale-codes-perl | grep Installed Installed: 3.62-1 Signed-off-by: Martin Renvoize Signed-off-by: Joonas Kylmälä Signed-off-by: Jonathan Druart (cherry picked from commit 58be086a18e39068fd12dfeef677f982ae735a73) Signed-off-by: Lucas Gass (cherry picked from commit 43aa7f36bf40692e2f71ebea6b122079a73522bd) Signed-off-by: Aleisha Amohia ----------------------------------------------------------------------- Summary of changes: debian/control | 2 ++ debian/list-deps | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Aug 7 04:18:23 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 07 Aug 2020 02:18:23 +0000 Subject: [koha-commits] main Koha release repository branch 19.11.x updated. v19.11.08-46-g5dc4323941 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, 19.11.x has been updated via 5dc432394112da175ed10e0454e75fd4d5ee1341 (commit) from f19e6015b0c76b765b5e81a43fb103bcc846bbdf (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 5dc432394112da175ed10e0454e75fd4d5ee1341 Author: Katrin Fischer Date: Sat May 23 01:12:22 2020 +0200 Bug 25499: Fix fund code column when closing a budget When closing a budget the fund code column in the table is always empty. This is due to a TT variable not being correct. To test: - Create a budget and fund - Order anything, leave basket open or not, but don't receive - Duplicate your existing budget - Close the first budget in order to move the pending orders - Verify the fund code is not showing in the table - Apply patch and reload the patch - Verify fund codes are now showing correctly Bonus: Changes the column heading Fund id to Fund ID. Signed-off-by: Abbey Holt Signed-off-by: Joonas Kylmälä Signed-off-by: Jonathan Druart (cherry picked from commit ab015f04dcd4956ca1ccd610d085e8b0c17ca733) Signed-off-by: Lucas Gass (cherry picked from commit 6ad9baace2099650a14c0ee478130ca3c01c673a) Signed-off-by: Aleisha Amohia ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Aug 7 04:37:00 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 07 Aug 2020 02:37:00 +0000 Subject: [koha-commits] main Koha release repository branch 19.11.x updated. v19.11.08-47-g5f209c6cb1 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, 19.11.x has been updated via 5f209c6cb1ea4a35f7febb037c1a35f944484fc4 (commit) from 5dc432394112da175ed10e0454e75fd4d5ee1341 (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 5f209c6cb1ea4a35f7febb037c1a35f944484fc4 Author: Owen Leonard Date: Thu Jun 18 13:10:35 2020 +0000 Bug 25351: Move cart-related strings out of opac-bottom.inc and into basket.js This patch adds the necessary JavaScript includes to the OPAC to enable translation of strings in JavaScript. It also updates the translation of cart-related strings by removing the strings from opac-bottom.inc and putting them in basket.js where they are used. To test, apply the patch and test that the correct strings are translatable. In this example I'm testing fr-FR: - Update a translation: > cd misc/translator > perl translate update fr-FR - Open the corresponding .po file for the strings pulled from JavaScript e.g. misc/translator/po/fr-FR-messages-js.po - Locate strings pulled from bootstrap/js/basket.js for translation, e.g.: #: koha-tmpl/opac-tmpl/bootstrap/js/basket.js:89 msgid "Your cart is currently empty" msgstr "" - Edit the "msgstr" string however you want (it's just for testing) - Install the updated translation: > perl translate install fr-FR In the OPAC, switch to the language you're testing. Confirm that your translated string appears. In the above example, by clicking the "Cart" icon in the header when there are no items in the cart. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit 7c8276bf0e64a2dc90af4aab0d6e78893edc12b1) Signed-off-by: Lucas Gass (cherry picked from commit 46710cfc0018d7107a68a1e6da847262bfb2470c) Signed-off-by: Aleisha Amohia ----------------------------------------------------------------------- Summary of changes: .../bootstrap/en/includes/doc-head-close.inc | 8 ++++ .../bootstrap/en/includes/opac-bottom.inc | 15 +------- koha-tmpl/opac-tmpl/bootstrap/js/basket.js | 44 +++++++++++----------- 3 files changed, 31 insertions(+), 36 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Aug 7 04:42:13 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 07 Aug 2020 02:42:13 +0000 Subject: [koha-commits] main Koha release repository branch 19.11.x updated. v19.11.08-48-g5cc580332c 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, 19.11.x has been updated via 5cc580332c359a630aece3158fde1d71c70e2dd2 (commit) from 5f209c6cb1ea4a35f7febb037c1a35f944484fc4 (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 5cc580332c359a630aece3158fde1d71c70e2dd2 Author: Didier Gautheron Date: Sun Jul 12 14:09:15 2020 +0200 Bug 25982: OPAC shelves RSS link output is xml Output rss feed as text/xml Test plan: 1) have books entered 2) log in create a list 3) add books to list 4) display list in OPAC 5) click the RSS link button. -- output is displayed as html text 6) apply patch 7) repeat steps 4&5 -- output is displayed as xml tree Signed-off-by: Sally Signed-off-by: Amit Gupta Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit 3d0da68d5ada37b40099fbc11b63202ccf7a48b2) Signed-off-by: Lucas Gass (cherry picked from commit 549cc995b2796b9e413c2860fe2d09fef5d97778) Signed-off-by: Aleisha Amohia ----------------------------------------------------------------------- Summary of changes: opac/opac-shelves.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Aug 7 04:52:33 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 07 Aug 2020 02:52:33 +0000 Subject: [koha-commits] main Koha release repository branch 19.11.x updated. v19.11.08-50-gbe3ab938d8 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, 19.11.x has been updated via be3ab938d8caa7e78cc349cd7203eb3ec3a0b7a5 (commit) via 8d5fb2c614808da961d84b0268415226b0532f38 (commit) from 5cc580332c359a630aece3158fde1d71c70e2dd2 (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 be3ab938d8caa7e78cc349cd7203eb3ec3a0b7a5 Author: Aleisha Amohia Date: Fri Aug 7 14:22:05 2020 +1200 Bug 26070: DBRev 19.11.08.003 Signed-off-by: Aleisha Amohia commit 8d5fb2c614808da961d84b0268415226b0532f38 Author: Owen Leonard Date: Mon Jul 27 19:16:07 2020 +0000 Bug 26070: Remove GoogleIndicTransliteration system preference The Google Transliterate API was deprecated on May 26, 2011. This patch removes the feature and associated system preference. To test, apply the patch and run the database update process. - Go to Administration -> System preferences and search for 'GoogleIndicTransliteration.' There should be no results. - Search the Koha codebase for references to 'GoogleIndicTransliteration.' There should be no current references.. Signed-off-by: Amit Gupta Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit 9b9e8fd32852acceb10cfc54d4a5a3acc0f6e232) Signed-off-by: Lucas Gass (cherry picked from commit cde498344dcb2739bd703b53bdbcdf728d5b5f0a) Signed-off-by: Aleisha Amohia ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- installer/data/mysql/sysprefs.sql | 1 - installer/data/mysql/updatedatabase.pl | 7 ++++++ .../prog/en/modules/admin/preferences/opac.pref | 7 ------ .../bootstrap/en/includes/opac-bottom.inc | 4 ---- .../bootstrap/js/googleindictransliteration.js | 27 ---------------------- opac/opac-main.pl | 5 ---- opac/opac-search.pl | 5 ---- 8 files changed, 8 insertions(+), 50 deletions(-) delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/js/googleindictransliteration.js hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Aug 7 17:24:11 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 07 Aug 2020 15:24:11 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v20.05.00-544-g6921916924 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 692191692429661e5b6a35a5e8198976c4f73cdc (commit) via 0e440c07bd5d574e3202cb94846fe5d898fe0a0d (commit) via 9d2b53c1b84cedbf264c9edf82b51f808396e1ac (commit) via 6a525c1cf702c6b90a0d7ab06eb50156d5e1d2ed (commit) via 82817e808fcc06aad887430548af2071a4848796 (commit) via e9b051baf7b92ab7482b74f8308298f2a151c198 (commit) via 16979c2afc45377bd2a4dcc3c50b3d2fa6771026 (commit) via f2572c0e0233927d56c1cf29ecac1eff75a025cb (commit) via 8f726d334085636146ae7bad56242e6129dcc493 (commit) via 9d1ba3487d167bda878069c9f0269ebba64ab30d (commit) via d79a19d3a0c32bd40279f138c3ca367042c290f9 (commit) via 45e1f325d590aaf8c46513d5eef0bd17e31d804c (commit) via ad9fdd792a4433d2ea5ea58a081f036d4230fdb8 (commit) via 1f96bea8bab9d2c259ef354bca5c554c351c5403 (commit) via 50e1f1abc1e1e9bb7294194aeba480f0441bd4b2 (commit) via a02e9e3d9107e4ae4b2a03128d53c786766d2582 (commit) via 4163f24014addb4cc5fddbb854f84617ffffb988 (commit) via 2d7fd8c09265880bf7ec548877569d698d14cdbb (commit) via 876d95285ef06224b0d50249b7096b55abff400d (commit) via 1cee6b7025e42c4e69d7dca0f4c852c66c939e36 (commit) via 3fc961b7c263a74da4759c70a3acff00eee71ec1 (commit) via df0ef02de5e4efe23aafab77e25d0e19f658151c (commit) via f74ab4e9de75b53dc7040814b1f25ae282a81106 (commit) via 3abc4fb8584e0df2b71dd9d38f033e34b205e829 (commit) via 0a40f71075c7dff1d9a99ab66b4210849c506648 (commit) via 5cf05ff53d7284500a2653f7b0988d6a46a7ea13 (commit) via 27ff36825dd6ac8f87dc7d380c60f21e8170dea6 (commit) via e7661a37e657141b994d74398dd8e1b96d1da117 (commit) via d08ce1d9406feca7bc7e5ab0be58efea94c7a2e5 (commit) via 4dd1672c1b2f15e0b6be6071b6915c927c3a2ecc (commit) via 44f54aac602ae99d83d954a2f102d77ff93ecfa7 (commit) via 85005b719876071047e4f6b99321549b665bcc05 (commit) via a96433446e87c03ac6e253a54eb067ac93a33575 (commit) via fd94f11afb5af5fc051ac75f3804cb9ea38fc677 (commit) via b0c47ad824e5bbfeb119558b7221df50b36a8ae4 (commit) via 2a1406c4766e43460dd3bf8c99c0636b51e9c7c4 (commit) from 5bad8da970b299588b49ca061555e1633f95a6fe (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 692191692429661e5b6a35a5e8198976c4f73cdc Author: Martin Renvoize Date: Fri Aug 7 15:38:54 2020 +0100 Bug 24201: (QA follow-up) Replace library select Removing the library select entirely results in a JS failure for desk selection when independant branches is enabled and the user does not have permission to select a library. This patch adds a hidden select element so we can still grab the current branch from the selection. Signed-off-by: Jonathan Druart commit 0e440c07bd5d574e3202cb94846fe5d898fe0a0d Author: Martin Renvoize Date: Fri Aug 7 15:20:55 2020 +0100 Bug 24201: (QA follow-up) Make logic consistent The display logic for the desk details in the header bar was inconsistent between the narrow display view and the full width display view. This patch updates the former to match the latter. Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart commit 9d2b53c1b84cedbf264c9edf82b51f808396e1ac Author: Martin Renvoize Date: Fri Aug 7 13:37:30 2020 +0100 Bug 24201: (QA follow-up) IndependentBranches This patch updates the IndependentBranches template display logic such that the 'Select desk' and 'Select library and desk' options appear correctly when IndependentBranches is enabled. Signed-off-by: Jonathan Druart commit 6a525c1cf702c6b90a0d7ab06eb50156d5e1d2ed Author: Martin Renvoize Date: Fri Aug 7 11:47:39 2020 +0100 Bug 24201: (QA follow-up) Add 'and desk' to menus and title Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart commit 82817e808fcc06aad887430548af2071a4848796 Author: Josef Moravec Date: Wed Aug 5 05:04:18 2020 +0000 Bug 24201: (QA follow-up) Another capitalization fix Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit e9b051baf7b92ab7482b74f8308298f2a151c198 Author: Martin Renvoize Date: Tue Aug 4 12:49:54 2020 +0100 Bug 24201: (QA follow-up) Correct call to set_userenv One call to set_userenv had been implimented incorrectly with the parameters out of order. Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 16979c2afc45377bd2a4dcc3c50b3d2fa6771026 Author: Martin Renvoize Date: Tue Aug 4 12:30:03 2020 +0100 Bug 24201: (QA follow-up) Capitalisation fix 'Set desk' vs 'Set Desk'. Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit f2572c0e0233927d56c1cf29ecac1eff75a025cb Author: Martin Renvoize Date: Tue Aug 4 12:28:44 2020 +0100 Bug 24201: (QA follow-up) Only display desks picker if enabled I missed a case on the authentication page with the prior patch of the same name. Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 8f726d334085636146ae7bad56242e6129dcc493 Author: Josef Moravec Date: Mon Aug 3 07:41:47 2020 +0000 Bug 24201: (QA follow-up) Make desk and branch selects on login page consistant Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart commit 9d1ba3487d167bda878069c9f0269ebba64ab30d Author: Josef Moravec Date: Mon Aug 3 07:37:10 2020 +0000 Bug 24201: (QA follow-up) Remove setdesk variable and add desk selection script only on pages in need Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart commit d79a19d3a0c32bd40279f138c3ca367042c290f9 Author: Josef Moravec Date: Mon Aug 3 07:29:15 2020 +0000 Bug 24201: (QA follow-up) Fix desks select box selected attribute Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart commit 45e1f325d590aaf8c46513d5eef0bd17e31d804c Author: Josef Moravec Date: Mon Aug 3 07:14:51 2020 +0000 Bug 24201: (QA follow-up) Remove unneeded use Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart commit ad9fdd792a4433d2ea5ea58a081f036d4230fdb8 Author: Josef Moravec Date: Mon Aug 3 07:11:49 2020 +0000 Bug 24201: (QA follow-up) Do not unbless a list from search in Desks template plugin Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart commit 1f96bea8bab9d2c259ef354bca5c554c351c5403 Author: Martin Renvoize Date: Mon Jul 20 13:38:34 2020 +0100 Bug 24201: (QA follow-up) Re-indent helpers Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 50e1f1abc1e1e9bb7294194aeba480f0441bd4b2 Author: Martin Renvoize Date: Mon Jul 20 13:37:59 2020 +0100 Bug 24201: (QA follow-up) Hide header if desks disabled Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit a02e9e3d9107e4ae4b2a03128d53c786766d2582 Author: Martin Renvoize Date: Mon Jul 20 13:20:39 2020 +0100 Bug 24201: (QA follow-up) Remove deprecated template file The controller associated to this template was deprecated earlier in this patchset, but the template was left behind. Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 4163f24014addb4cc5fddbb854f84617ffffb988 Author: Nicolas Legrand Date: Tue Apr 28 12:02:15 2020 +0200 Bug 24201: (follow-up) add desk choice with library choice You should be able to add desk choice when you are logging in or changing library. Test plan: 1. apply patch 2. have at least three libraries, one without desk, one with one and one with a few. 3. At login, when choosing a library, it should enable all desks it has. Pick one. 4. the desk id and name should be set in your session and appear in the top right, next to the library name. 5. change library and desks from intranet (at the set-library.pl page) 6. you should have the same behaviours 7. if you have a library without a desk, it should prompt you a '---' option and no desks will be attached to the session. Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 2d7fd8c09265880bf7ec548877569d698d14cdbb Author: Martin Renvoize Date: Thu Mar 26 14:49:27 2020 +0000 Bug 24201: (follow-up) Rework Desks Plugin This patch removes unused plugin methods (they can be re-introduced in subsequent bugs where they are used) and merges the 'all' and 'defined' methods into a ListForBranch method that returns a list of desks associated with the logged in branch. Signed-off-by: Andrew Fuerste-Henry Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 876d95285ef06224b0d50249b7096b55abff400d Author: Martin Renvoize Date: Thu Mar 26 13:49:57 2020 +0000 Bug 24201: (follow-up) Use GetLoggedInDeskName This patch updates the templates to use the new TT plugin instead of adding additional variables to the already crouded get_template_and_user. Signed-off-by: Andrew Fuerste-Henry Signed-off-by: Andrew Fuerste-Henry Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 1cee6b7025e42c4e69d7dca0f4c852c66c939e36 Author: Owen Leonard Date: Wed Mar 25 12:13:10 2020 +0000 Bug 24201: (follow-up) Show desk information at lower screen widths The staff client header menu adjusts responsively to narrower viewport widths, but for the logged-in-user menu this requires showing and hiding part of the template which duplicates information. This patch adds a copy of the current desk information to the part of the template shown at narrower widths. To test, apply the patch and view any page in the staff client. - Narrow your browser so that the viewport is less than 800px wide. - The logged-in-user menu should change from text to a single "user" icon. - Clicking the icon should display a menu which includes labeled information about the current desk. Signed-off-by: Nicolas Legrand Signed-off-by: Andrew Fuerste-Henry Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 3fc961b7c263a74da4759c70a3acff00eee71ec1 Author: Nicolas Legrand Date: Tue Dec 10 15:02:31 2019 +0100 Bug 24201: Attach desk to intranet session When Desks are defined, a librarian can attach a desk to its session. Test plan: 1. apply 13881 and create some desks 2. you should see “NO DESK SET” in the intranet header 3. go to circulation > Set desk 4. you should see your desk name in the header, whatever the page 5. you can also set desk with the header menu Signed-off-by: Martin Renvoize Signed-off-by: Andrew Fuerste-Henry Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit df0ef02de5e4efe23aafab77e25d0e19f658151c Author: Julian Maurice Date: Fri Apr 10 11:19:47 2020 +0200 Bug 24591: Add --help option to misc/devel/get-prepared-letter.pl Also fix code style with perltidy Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit f74ab4e9de75b53dc7040814b1f25ae282a81106 Author: Julian Maurice Date: Wed Feb 5 12:20:37 2020 +0100 Bug 24591: Add developer script to preview a letter The script is very simple, it just calls GetPreparedLetter with arguments given on command line and print the resulting letter content Usage example: misc/devel/get-prepared-letter.pl --module circulation \ --letter_code ODUE --tables '{"borrowers":1,"branches":"CPL"}' \ --repeat '{"item":[{"biblio":1,"items":1}]}' \ --loops '{"overdues":[1]}' Signed-off-by: Bernardo Gonzalez Kriegel Works for the example and other cases. Correct option is 'letter-code', with dash, not underscore. An usage message would be nice. No errors Signed-off-by: Nick Clemens JD amended patch: tidy the new file and rename it matching the other scripts' names in this directory Signed-off-by: Jonathan Druart commit 3abc4fb8584e0df2b71dd9d38f033e34b205e829 Author: David Roberts Date: Sun May 3 23:48:09 2020 +0000 Bug 25336: Show checkouts/fines to guarantor is in the wrong section of the patron file This patch moves the "Show checkouts to guarantor" and "Show fines to guarantor" data to display under the Contact information block To test: 1) Enable the AllowStaffToSetCheckoutsVisibilityForGuarantor and AllowStaffToSetFinesVisibilityForGuarantor system preferences to Allow 2) View a patron record. 3) The "Show checkouts to guarantor" and "Show fines to guarantor" field will be on the right hand side of the screen under the Library use block. 4) Apply patch 5) Check that this data has now moved to the Contact information block on the left hand side of the patron record. Works for me! Signed-off-by: Caroline Cyr La Rose Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 0a40f71075c7dff1d9a99ab66b4210849c506648 Author: Nick Clemens Date: Thu Aug 6 18:19:58 2020 +0000 Bug 25606: (QA follow-up) Don't show remove all button if no reserves Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 5cf05ff53d7284500a2653f7b0988d6a46a7ea13 Author: Joseph Sikowitz Date: Sat May 23 17:45:51 2020 -0400 Bug 25606: Remove all reserve items button Adds button to course records to remove all attached reserve items. A warning dialog box will appear before executed. Test plan 1. Install patch 2. Log in as user with permission to delete reserves 3. View a course reserve record with multiple items attached 4. There should now be a button that says "- Batch remove reserves" 5. When you click the button a dialog box should appear with a warning 6. Click "Ok" 7. All course reserves should be removed from the record 8. Add an item to more than course record 9. Redo 3-7 10. Items should have been removed from that course but remain on all other courses 11. Log in as a user without delete reserves permission 12. You should not see the batch remove option Signed-off-by: Lucas Gass Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 27ff36825dd6ac8f87dc7d380c60f21e8170dea6 Author: Katrin Fischer Date: Sat Jul 18 10:24:23 2020 +0000 Bug 25919: Only show Desks in admin navigation when UseCirculationDesks is used We were missing a check for the UseCirculationDesks in the template so the "Desks" link would only appear in the admin navigation when the pref feature is activated. To test: - Turn off UseCirculationDesks - Go to any administration page that shows the navigation on the left - Verify Desks shows - Apply patch - Reload the admin page - Desks should be gone - Turn on UseCirculationDesks - Verify the Desks reappear Signed-off-by: Sally Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit e7661a37e657141b994d74398dd8e1b96d1da117 Author: Katrin Fischer Date: Sat Jul 18 01:53:34 2020 +0000 Bug 25853: Fix file permissions for update_patrons_category script The permissions for this were -rw-r--r-- and need to be -rwxr-xr-x. To test: - Verify the file permissions before and after applying the patch. Signed-off-by: Didier Gautheron Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit d08ce1d9406feca7bc7e5ab0be58efea94c7a2e5 Author: Josef Moravec Date: Thu Aug 6 19:15:44 2020 +0000 Bug 26009: (QA follow-up) It does not harm to test more Test plan: prove t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t --> should return green Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 4dd1672c1b2f15e0b6be6071b6915c927c3a2ecc Author: Nick Clemens Date: Fri Jul 17 16:23:42 2020 +0000 Bug 26009: Add facet size to home/holdingbranch To test: 0 - Set DisplayLibraryFacets to 'both' and FacetMaxCount to 20 1 - Have more than 10 branches 2 - Have items in each of those branches 3 - Enable ES, set system preference SearchEngine to Elasticsearch 4 - Search for '*' 5 - Expand homebranch/holdingbranch facets 6 - Note you only get 10 7 - Apply patch 8 - Repeat search 9 - Now you get all your facets Signed-off-by: Michael Springer Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 44f54aac602ae99d83d954a2f102d77ff93ecfa7 Author: Nick Clemens Date: Tue Aug 4 13:13:43 2020 +0000 Bug 26136: Prevent double submit on checkin-form To test: 1 - Browse to Circulation->Check-in 2 - Type a barcode into the Check in box 3 - Hit Enter as many as times as you can 4 - Check the statistics table: SELECT * FROM statistics WHERE itemnumber={itemnumber} AND DATE(datetime)=CURDATE(); 5 - Note you have multiple lines for the same item at the same time 6 - Apply patch 7 - Reload the page 8 - Type the barcode 9 - Press Enter even more fast and more furiously 10 - Check the statistics table 11 - Only one entry, huzzah! Signed-off-by: Sally Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 85005b719876071047e4f6b99321549b665bcc05 Author: Jonathan Druart Date: Thu Aug 6 13:29:44 2020 +0200 Bug 26158: Fix Z3950 search button broken for translations This is similar to bug 23713 var SEARCH_RESULTS = [% IF (SEARCH_RESULTS) %]1[% ELSE %]0[% END %]; become, once translated: var SEARCH_RESULTS = [% IF (SEARCH_RESULTS) %]1[% ELSE %][% END %]; and a JS error appears in the console Uncaught SyntaxError: expected expression, got ';' search.pl:636:29 Caused by commit ef4306cc02e2f15aa2466ae65d0b4f9a1fd70ad9 Bug 23885: Move staff client search results JavaScript into separate file Test plan: Use the staff interface in a translated language Search for a term that won't return any results Click the Z3950 button Signed-off-by: Owen Leonard Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit a96433446e87c03ac6e253a54eb067ac93a33575 Author: Jonathan Druart Date: Thu Aug 6 15:08:48 2020 +0200 Bug 26162: Make Selenium click action more robust See https://stackoverflow.com/questions/12967541/how-to-avoid-staleelementreferenceexception-in-selenium https://www.selenium.dev/exceptions/ https://developer.mozilla.org/en-US/docs/Web/WebDriver/Errors/StaleElementReference This patch will fix the following failure we get under D11: 18:47:07 selenium_1 | 09:47:07.478 WARN - Exception: Element not found in the cache - perhaps the page has changed since it was looked up 18:47:07 selenium_1 | For documentation on this error, please visit: http://seleniumhq.org/exceptions/stale_element_reference.html 18:47:07 selenium_1 | Build info: version: '2.53.1', revision: 'a36b8b1', time: '2016-06-30 17:37:03' 18:47:07 selenium_1 | System info: host: '78b9a07f51f2', ip: '192.168.16.2', os.name: 'Linux', os.arch: 'amd64', os.version: '4.19.0-9-amd64', java.version: '1.8.0_91' 18:47:07 selenium_1 | Driver info: driver.version: unknown 18:47:07 koha_1 | 18:47:07 koha_1 | STRACE: /usr/share/perl5/Try/Tiny.pm:123 in Selenium::Remote::Driver::catch {...} 18:47:07 koha_1 | /usr/local/share/perl/5.26.1/Selenium/Remote/Driver.pm:353 in Try::Tiny::try 18:47:07 koha_1 | (eval 1571):1 in Selenium::Remote::Driver::__ANON__ 18:47:07 koha_1 | (eval 1573):2 in Selenium::Remote::Driver::__ANON__ 18:47:07 koha_1 | (eval 1546):17 in Selenium::Remote::Driver::_execute_command 18:47:07 koha_1 | /usr/local/share/perl/5.26.1/Selenium/Remote/WebElement.pm:63 in Selenium::Remote::WebElement::_execute_command 18:47:07 koha_1 | /kohadevbox/koha/t/lib/Selenium.pm:184 in Selenium::Remote::WebElement::click 18:47:07 koha_1 | /kohadevbox/koha/t/lib/Selenium.pm:172 in t::lib::Selenium::click_when_visible 18:47:07 koha_1 | t/db_dependent/selenium/administration_tasks.t:131 in t::lib::Selenium::click Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart commit fd94f11afb5af5fc051ac75f3804cb9ea38fc677 Author: Nick Clemens Date: Thu Aug 6 12:40:20 2020 +0000 Bug 25826: (QA follow-up) Add filters Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit b0c47ad824e5bbfeb119558b7221df50b36a8ae4 Author: Tomas Cohen Arazi Date: Mon Jul 27 12:18:36 2020 -0300 Bug 25826: Forbid changing the hidden attributes for biblionumber This patch tweaks the UI so it forbids changing the hidden values when they are correct (i.e. when they are not hidden in OPAC and intranet). To test: 1. Apply the first patch 2. Play with the hidden values of the subfield you have mapped to biblio.biblionumber in your picked framework. This is usually 999$c in MARC21, and 001 in UNIMARC. => SUCCESS: When you verify the about.pl, it mentions issues when you hide in some of the interfaces 3. Apply this patch and reload everything 4. Repeat 2 => SUCCESS: If your framework is 'ok', it prevents you from editing this values, otherwise you can change them. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 2a1406c4766e43460dd3bf8c99c0636b51e9c7c4 Author: Jonathan Druart Date: Wed Jul 22 16:43:38 2020 +0200 Bug 25826: Add a warning to the about page This patch adds a warning to the about page if the biblionumber field is hidden at the OPAC or staff interface. Test plan: Hide the biblionumber to some framework Confirm that there is a warning on the about page Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: C4/Auth.pm | 27 +++-- C4/Context.pm | 7 +- Koha/SearchEngine/Elasticsearch/QueryBuilder.pm | 4 +- Koha/Template/Plugin/Desks.pm | 104 +++++++++++++++++++ about.pl | 28 +++++ admin/marc_subfields_structure.pl | 28 +++++ circ/set-library.pl | 22 ++++ course_reserves/course-details.pl | 10 +- koha-tmpl/intranet-tmpl/prog/css/login.css | 2 +- .../intranet-tmpl/prog/en/includes/admin-menu.inc | 4 +- .../intranet-tmpl/prog/en/includes/circ-nav.inc | 11 +- .../intranet-tmpl/prog/en/includes/header.inc | 37 ++++++- .../prog/en/includes/html_helpers.inc | 15 +++ .../prog/en/includes/intranet-bottom.inc | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 16 ++- .../en/modules/admin/marc_subfields_structure.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt | 16 +++ .../prog/en/modules/catalogue/results.tt | 6 +- .../prog/en/modules/circ/circulation-home.tt | 4 + .../intranet-tmpl/prog/en/modules/circ/returns.tt | 1 + .../prog/en/modules/circ/set-library.tt | 37 ++++++- .../en/modules/course_reserves/course-details.tt | 7 ++ .../prog/en/modules/members/moremember.tt | 36 +++---- koha-tmpl/intranet-tmpl/prog/js/desk_selection.js | 42 ++++++++ .../prog/js/marc_subfields_structure.js | 18 +++- misc/cronjobs/update_patrons_category.pl | 0 misc/devel/get_prepared_letter.pl | 114 +++++++++++++++++++++ .../Koha/SearchEngine/Elasticsearch/QueryBuilder.t | 5 +- t/lib/Selenium.pm | 15 ++- 29 files changed, 564 insertions(+), 55 deletions(-) create mode 100644 Koha/Template/Plugin/Desks.pm create mode 100644 koha-tmpl/intranet-tmpl/prog/js/desk_selection.js mode change 100644 => 100755 misc/cronjobs/update_patrons_category.pl create mode 100755 misc/devel/get_prepared_letter.pl hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Aug 10 10:34:57 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Aug 2020 08:34:57 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v20.05.00-546-g7b8664b559 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 7b8664b5590cdffc2579bebc1fd6435fe236d879 (commit) via 233e3efba308fe63e7e40caa7830ec83e4770d13 (commit) from 692191692429661e5b6a35a5e8198976c4f73cdc (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 7b8664b5590cdffc2579bebc1fd6435fe236d879 Author: Jonathan Druart Date: Mon Aug 10 10:00:34 2020 +0200 Bug 25826: fix failing test Signed-off-by: Jonathan Druart commit 233e3efba308fe63e7e40caa7830ec83e4770d13 Author: Jonathan Druart Date: Mon Aug 10 09:57:23 2020 +0200 Bug 24201: fix failing tests Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/admin/marc_subfields_structure.tt | 7 ++++++- t/Koha/Script.t | 4 +++- t/Koha/Script_cron.t | 4 +++- 3 files changed, 12 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Aug 10 13:01:20 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Aug 2020 11:01:20 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v20.05.00-547-g70ff3bafa0 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 70ff3bafa05a30944962747953c70bb8dc3c1ab8 (commit) from 7b8664b5590cdffc2579bebc1fd6435fe236d879 (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 70ff3bafa05a30944962747953c70bb8dc3c1ab8 Author: Jonathan Druart Date: Mon Aug 10 11:59:58 2020 +0200 Bug 26162: Wait for the table to be refreshed The previous patch did not work as expected. We still got a StaleElementReference exception. But this time on 10:43:47 selenium_1 | Caused by: org.openqa.selenium.NoSuchElementException: Unable to locate element: {"method":"xpath","selector":"//*[@id=\"branchname\"]"} Because we found the one that existed on the page, not the one sent back in AJAX. The idea of this patch is to search for the "Showing 1 to X of Y entries" info and wait for X == Y Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: t/db_dependent/selenium/administration_tasks.t | 6 ++--- t/lib/Selenium.pm | 31 +++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Aug 13 06:45:23 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 13 Aug 2020 04:45:23 +0000 Subject: [koha-commits] main Koha release repository branch 19.11.x updated. v19.11.08-51-g0a5da94a53 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, 19.11.x has been updated via 0a5da94a53f9fa2beead2c0bdb791eb723b89817 (commit) from be3ab938d8caa7e78cc349cd7203eb3ec3a0b7a5 (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 0a5da94a53f9fa2beead2c0bdb791eb723b89817 Author: Jonathan Druart Date: Tue May 26 10:50:31 2020 +0200 Bug 25599: Fix default value placeholders for UseACQFrameworkForBiblioRecords The feature was there but a condition disabled it. Test plan: - modify the default value for 008@ or another subfield in the ACQ framework using one or more of the placeholders above - activate UseACQFrameworkForBiblioRecords - create a basket - create an order from a new record - verify the values have been replaced Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart (cherry picked from commit b16e463173e8125396eaef3159d08df5d0d2cfb6) Signed-off-by: Lucas Gass (cherry picked from commit 34b5cd5267243867042325550ba50bd7a0ee46aa) Signed-off-by: Aleisha Amohia ----------------------------------------------------------------------- Summary of changes: acqui/neworderempty.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Aug 13 08:25:49 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 13 Aug 2020 06:25:49 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v20.05.00-575-g9b342c81a0 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 9b342c81a044baeb8220e8a80ad8349adf8ff5b0 (commit) via cf6d7d18bc68c47fc02038a21e33d7cf816f25ab (commit) via 2bb09975bc5efc336e77b04e5f5f791aad3d6f76 (commit) via 488e76ea3a6e0591bc6134947011d990c81190eb (commit) via 75e25c9d38edc86f7cd545e55b919624f92e2716 (commit) via 0629d4082fec2474a25c18fca4f134d4b75c3ad3 (commit) via ca3f7ceb2a5e1dc6d62b4500392ec9ca834c0b48 (commit) via 3d519c897743d000e445ea97ddf4045e296ea9b6 (commit) via 948a7c5f74b461b0d7a6438a49d2ea64dcb2428b (commit) via 510ee8a1a38ee18fc38ff33c6351798aa656d814 (commit) via d09fbb284b50d12783f76fd58400d093f84ce159 (commit) via bc882fcb13569a2ef8858bfa41856e7df4992388 (commit) via e234eb84e103ae8fb29d81bf4702342a0faf5c91 (commit) via 4de06b1711a3838adb79b6c33f6a5dd8a59e5bae (commit) via ec630b4b6c9949a51e8491c0c8b3e30d3a43df50 (commit) via bd29f99a8627d08a6e5c2fdcf3d312dfd7260020 (commit) via db1587520778bd940da389fab8f46a12c1c11f73 (commit) via 4cf5ef239f1e1a05c277a91f73b6fcd245eb5ec0 (commit) via b332e0912d8883928061b10e87d0b8f3e7c9c30d (commit) via 4dc25f3192e4d32a07b2cbaec653b98dca9618c5 (commit) via 1ceb44ba2d9ae40d0c0230b009dcd6850bc27d46 (commit) via 3138c48f69ff19493c7433145144c06a077825be (commit) via 3d2a988809eddc4cdd3469aa5dc2a8f25252306b (commit) via ed4fc5889467bde858cfd4ac573cd40a5b4279c5 (commit) via 81f06881a45d7647481aa8a21354a772f3daff88 (commit) via 19d9ba176dea6b7816a33b014a5f9e309af53dc0 (commit) via a2b2426de842ac86048cbf71e3760b6483fc0b3c (commit) via 1a2d7f1eacc0722ea0723577823ee6a477a46b0a (commit) from 70ff3bafa05a30944962747953c70bb8dc3c1ab8 (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 9b342c81a044baeb8220e8a80ad8349adf8ff5b0 Author: Jonathan Druart Date: Wed Aug 12 14:03:00 2020 +0200 Bug 5428: Add searchid to the "Return to the record" button (batch del) Signed-off-by: Jonathan Druart commit cf6d7d18bc68c47fc02038a21e33d7cf816f25ab Author: Nick Clemens Date: Fri Aug 7 00:43:29 2020 +0000 Bug 5428: (QA follow-up) Add searchid for deleting items in a batch and editing in batch To test: 0 - Perform a search in the staff client 1 - Click a title to go to the details page for a record 2 - Click the 'Edit' button and select 'Edit items in a batch' 3 - Note the searchid is in the url 4 - Make a change and hit 'Save' 5 - Note the 'Return the the record' link at the top, and the button on the bottom include searchid in URL 6 - Click one and note the brwoser is stil there 7 - Click 'Edit' and select 'Delete items in a batch' 8 - Delete one item 9 - Click return to record 10 - Browser is there 11 - Click 'Delete items in a batch again 12 - Select all and check 'Delete records if no items remain' 13 - Delete them 14 - Note you have a link to 'Go back to the results' Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 2bb09975bc5efc336e77b04e5f5f791aad3d6f76 Author: Jonathan Druart Date: Tue Aug 4 14:36:38 2020 +0200 Bug 5428: Jump back to the search result after deleting a record This patch adds the ability to jump back to the search result after a record has been deleted. Also it keeps the "browser" when all items are deleted from a bibliographic record Test plan: - Start a new search - Select a record with items - Delete all the items => You still see the browser - Delete the record => You are back to the adv search form but we new link "Go back to the results" is present at the top of the page Limitation: As we delete the record we do not longer know the offset, we are back to the first page of the result list Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 488e76ea3a6e0591bc6134947011d990c81190eb Author: Owen Leonard Date: Mon Jul 13 20:09:17 2020 +0000 Bug 20154: Stay in the open tab when editing authority record This patch adds some JavaScript to the authority record detail page in the staff interface so that clicking "Edit" will take you to the authority edit page while keeping the same tab open. To test, apply the patch and locate an authority record in your catalog. - Click any of the numbered tabs besides tab 0. - Choose "Edit record" from the "Edit" dropdown menu. - When the authorities edit page loads the same tab should be preselected. Signed-off-by: Marjorie Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 75e25c9d38edc86f7cd545e55b919624f92e2716 Author: Owen Leonard Date: Mon Jul 27 15:57:40 2020 +0000 Bug 21345: Patron records with attached files not obvious from patron details view This patch adds a section to the patron details page for listing files which have been attached to the patron record. To test, apply the patch and enable the EnableBorrowerFiles system preference. - If necessary, attach some files to a patron record by viewing a patron record and choosing "Files" from the sidebar menu. - View the detail page (moremember.pl) for a patron who has files attached. - You should see a new section under "Alternative contact" with the heading "Files." - Test the "Manage" button to make sure it takes you to that patron's files. - Confirm that all the attached files are listed. - Confirm that the links to each file work correctly. Signed-off-by: Sally Signed-off-by: Barbara Johnson Signed-off-by: Katrin Fischer JD amended patch: replace a html filter with uri Bug 21345: (follow-up) Hide files information if EnableBorrowerFiles is disabled This patch wraps the new patron file information in a check for the EnableBorrowerFiles system preference. Signed-off-by: Jonathan Druart commit 0629d4082fec2474a25c18fca4f134d4b75c3ad3 Author: Owen Leonard Date: Mon Dec 2 16:42:59 2019 +0000 Bug 24134: Add placeholder for 2 digit years to allow autogeneration of dates in 008 This patch modifies the code for parsing MARC framework configurations so that the placeholder "<>" translates to a two-year date. To test, apply the patch and modify a framework to include placeholders. For example, in MARC21: - Administration -> MARC structure -> 952 -> Edit subfields -> d - Expand "Advanced constraints" and add a default value: <> <> <> <
> <> - Save your configuration and go to Cataloging. - Go to the add/edit items page for a record which uses the framework you edited. - In the "Add item" form, in the "Date aquired" field, you should see the correct values. For example: '2019 19 12 03 Leonard' Perform the same test when adding an item during the Acquisitions process (depending on your AcqCreateItem setting). Note that acqui/neworderempty.pl has been modified because the placeholder-replacement code is repeated there, but I couldn't discover how to test it (if it is used at all?) Signed-off-by: Lucas Gass Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit ca3f7ceb2a5e1dc6d62b4500392ec9ca834c0b48 Author: Lucas Gass Date: Sun Aug 2 16:49:59 2020 +0000 Bug 24176: Add datalastseen column to holdings table This patch adds the datelastseen column to the holdings table and also makes it column configurable. To Test: -Apply patch and have a look at some item records. -Notice the datalastseen column -Make sure it wroks and its displaying the datelastseen correctly -Go to the column configuration tools and make sure you can properly hide this column. Signed-off-by: Sally Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 3d519c897743d000e445ea97ddf4045e296ea9b6 Author: Tomas Cohen Arazi Date: Tue Aug 11 11:45:14 2020 -0300 Bug 24306: (QA follow-up) Fix the XML Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 948a7c5f74b461b0d7a6438a49d2ea64dcb2428b Author: Nick Clemens Date: Tue Jul 28 12:01:05 2020 +0000 Bug 24306: (follow-up) Add documentation for debug option Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 510ee8a1a38ee18fc38ff33c6351798aa656d814 Author: Nick Clemens Date: Tue Dec 24 13:59:02 2019 +0000 Bug 24306: Add debug switch to koha-indexer This raises the debug level a lot, it it a bit overwhelming, but may be useful in debugging indexing issues To test: 1 - Apply patches 2 - sudo koha-indexer --stop instance 3 - sudo debian/scripts/koha-indexer --start --debug instance 4 - tail -f /var/log/koha/instance/indexer-output.log 5 - Note you get a listing that nothign in the queue 6 - Go to staff client and make a change to a record 7 - Note the logs have tons of info Signed-off-by: David Nind Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit d09fbb284b50d12783f76fd58400d093f84ce159 Author: Martin Renvoize Date: Wed Jun 3 14:51:42 2020 +0100 Bug 25663: Remove Koha::RefundLostItemFeeRule and uses This patch replaces all calls to RefundLostItemFeeRules with Koha::CirculationRules->get_lostreturn_policy and removes the module it makes redundant. Test plan 1/ Confirm that there are no longer any uses of RefundLostItemFeeRules in the codebase 2/ Confirm circulation tests still all pass 3/ Confirm you can still set and unset the lost return rules 4/ Signoff Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit bc882fcb13569a2ef8858bfa41856e7df4992388 Author: Martin Renvoize Date: Wed Jun 3 12:59:21 2020 +0100 Bug 25663: Add get_lostreturn_policy method to CirculationRules This patch adds a new get_lostreturn_policy method to Koha::CirculationRules which returns a boolean to the caller which denotes whether a refund should be applied or not on the return of a lost item. Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit e234eb84e103ae8fb29d81bf4702342a0faf5c91 Author: Martin Renvoize Date: Wed Jun 3 14:13:22 2020 +0100 Bug 25663: Add unit tests This patch adds unit tests for a new get_lostretun_policy method which is getting added to Koha::CirculationRules. Test plan: 1/ Read the additions to t/db_dependent/CirculationRules.t code and compare to the t/db_dependent/RefundLostItemFeeRule.t. 2/ Run the test after applying the patch that adds the new method 3/ If the tests all pass, signoff Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 4de06b1711a3838adb79b6c33f6a5dd8a59e5bae Author: Owen Leonard Date: Sat Aug 8 13:30:35 2020 +0000 Bug 25879: (follow-up) Update overlooked guarantor markup This patch updates another section of guarantor markup which should have been updated with the others. To test, apply the patch and locate an adult patron. - Click "Add guarantee" - Confirm that the part of the form for adding a guarantee looks correct. - Confirm that the new patron information is saved correctly. Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit ec630b4b6c9949a51e8491c0c8b3e30d3a43df50 Author: Owen Leonard Date: Fri Jun 26 18:51:15 2020 +0000 Bug 25879: Improve display of guarantor information in the patron entry form This patch makes some changes to the patron entry template to improve the display of guarantor information. To test, apply the patch and locate a patron with a "Child" type category. - Edit the patron's record - Under "Guarantor information," click the "Search to add" button. - Search for and select a patron. - The guarantor information should be added to the patron edit form. The information should be correct and well formatted. - Click the "Remove" link. The guarantor information should be removed. - Search for an select a guarantor again and save the record. - Edit the patron record again. The saved guarantor information should look correct. Looks great! Signed-off-by: Caroline Cyr La Rose Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit bd29f99a8627d08a6e5c2fdcf3d312dfd7260020 Author: Owen Leonard Date: Sat Jul 11 12:09:49 2020 +0000 Bug 25906: Style corrections for OPAC serial pages This patch makes some CSS changes to the OPAC SCSS and to the OPAC "full serial issues" page to improve the style. I've expanded the in-page CSS on the full serial issues page for readability and added Template Toolkit's "collapse" filter to remove the whitespace on rendering. To test, apply the patch and rebuild the OPAC CSS (https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client) - Locate a serial record in the OPAC. - Click "More details" to view the issues page. - Confirm that the "view" tabs look correct, with consistent padding. - Click the "Full history" tab. - In the sidebar, the filter should have full-width dropdowns and clear button. Signed-off-by: Timothy Alexis Vass Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit db1587520778bd940da389fab8f46a12c1c11f73 Author: Owen Leonard Date: Fri Jul 17 14:43:39 2020 +0000 Bug 26008: Remove the use of jquery.checkboxes plugin from OPAC cart This patch removes the use of the jquery.checkboxes plugin from the OPAC cart and replaces its functionality with "plain" jQuery. To test, apply the patch and add some items to the Cart in the OPAC. - Open the Cart window in the OPAC by clicking the "Cart" link in the header. - Test that the "Select all" and "Clear all" links work correctly to check and uncheck all checkboxes. - Controls like "Remove" and "Place hold" should be enabled or disabled according to whether there are any checked checkboxes. - Test that manually checking a checkbox correctly enables or disables the link options too. - Test that the "Remove" or "Place hold" controls work correctly, applying to only the checked checkboxes. Signed-off-by: Sally Signed-off-by: Katrin Fischer Bug 26008: (follow-up) Removed checkboxed class This patch removes the "checkboxed" class which was previously associated with the jquery.checkboxes plugin and is now obsolete. Signed-off-by: Jonathan Druart commit 4cf5ef239f1e1a05c277a91f73b6fcd245eb5ec0 Author: Owen Leonard Date: Fri Jul 17 17:29:15 2020 +0000 Bug 26010: Remove the use of jquery.checkboxes plugin from staff interface cart This patch removes the use of the jquery.checkboxes plugin from the staff interface cart and replaces its functionality with "plain" jQuery. To test, apply the patch and add some items to the Cart in the staff interface. - Open the Cart window in the staff interface by clicking the "Cart" link in the header. - Test that the "Select all" and "Clear all" links work correctly to check and uncheck all checkboxes. - Test that the "Remove" or "Place hold" controls work correctly, applying to only the checked checkboxes whether they were checked using "Select all" or by manually checking them. Signed-off-by: Sally Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit b332e0912d8883928061b10e87d0b8f3e7c9c30d Author: Owen Leonard Date: Wed Jul 29 13:49:16 2020 +0000 Bug 26087: Add table configuration and export options to orders by fund report This patch adds column configuration to the orders by funds report results table. The "Basket" column is excluded from being togglable. To test, apply the patch and clear your browser cache if necessary. - Go to Reports -> Orders by fund - Submit parameters which will return multiple results. - Test that the "Column visibility" button works to show and hide columns. The "Basket" column should be excluded. - Test the export options (Excel, CSV, etc) - Go to Administration -> Columns settings and edit the default configuration of the orders by fund report. Confirm that these changes are reflected in the report results. Signed-off-by: Sally Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 4dc25f3192e4d32a07b2cbaec653b98dca9618c5 Author: Owen Leonard Date: Wed Jul 29 16:21:10 2020 +0000 Bug 26091: Add column configuration and export options to catalog statistics report This patch makes the catalog statistics report output a DataTable with on-the-fly column configuration and export options. Because the report can generate results with an arbitrary set of table headers, the columns set to be passed to DataTables is built on the fly along with the table. There is no global table setting. Since the "grand total" cell might reflect a total which includes hidden columns, the table footer label now indicates "all results." To test, apply the patch and go to Reports. - Submit a query to the "catalog" statistics wizard which will return multiple results. - On the results page, confirm that the DataTable displays correctly and that all controls work as expected, including column configuration and export options. - Submit other queries which will return a different set of columns in the result. Confirm that everything continues to work as expected. Signed-off-by: Sally Signed-off-by: Katrin Fischer Bug 26091: (follow-up) Remove unused TablesSettings usage Since the table column information is built in the template rather than in the columns_settings YML file we don't need "USE TablesSettings" in this template. Signed-off-by: Jonathan Druart commit 1ceb44ba2d9ae40d0c0230b009dcd6850bc27d46 Author: Martin Renvoize Date: Thu Aug 6 14:33:32 2020 +0100 Bug 26160: Make POS items table configurable 1) System preference: EnablePointOfSale - set to Enable 2) System preference: UseCashRegisters - set to Use 3) Administration > Accounting > Cash registers - create a new cash register for the library you're logged in as 4) Administration > Accounting > Debit types - create at least one debit type 5) Home > Point of sale - verify that all four columns exist in the Items for purchase table: Code, Description, Cost, Action 6) Administration > Additional parameters > Table settings > Point of sale - change which columns can be hidden and/or toggled 7) Home > Point of sale - verify that your choices have been implemented (columns are hidden, columns can be toggled, columns can't be toggled) 8) Repeat steps 6 and 7 for different combinations, checking that they all work. Signed-off-by: Sally Signed-off-by: Katrin Fischer Added Sally's test plan. Signed-off-by: Jonathan Druart commit 3138c48f69ff19493c7433145144c06a077825be Author: Martin Renvoize Date: Thu Aug 6 15:22:07 2020 +0100 Bug 26161: Move actions under rhs fieldsets This patch moves the action buttons div to within the column div that contains the 'This sale' and 'Collect payment' fieldsets. Test plan 1/ Apply patch 2/ Navigate to the 'Point of sale' page (having enabled UseCashRegisters and EnablePointOfSale) 3/ Confirm the 'Confirm' and 'Cancel' button/link now appear on the correct side. 4/ Signoff Signed-off-by: Sally Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 3d2a988809eddc4cdd3469aa5dc2a8f25252306b Author: Timothy Alexis Vass Date: Fri Aug 7 14:59:16 2020 +0200 Bug 26179: Remove redundant import of Google font Removed redundant @import of google font Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit ed4fc5889467bde858cfd4ac573cd40a5b4279c5 Author: Jonathan Druart Date: Wed Jul 29 16:49:14 2020 +0200 Bug 26012: Correctly format "paid for" info on the item details view The string is built controller side, which does not let the template format the info nicely. We want to display patron's info using patron-title.inc and the date with the KohaDates plugin Test plan: - Make sure there is a replacement cost in the item - check it out - Mark it lost - Pay the lost item fee - Go to the detail page and look on the items tab for the item - It will show an entry with "Paid for?" label The patron's info and date must be correctly formatted Signed-off-by: Sally Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 81f06881a45d7647481aa8a21354a772f3daff88 Author: Jonathan Druart Date: Fri Aug 7 12:44:28 2020 +0200 Bug 26165: Fix duplication of large saved reports If the combined character length of a saved report's title, notes and SQL is too long then pressing the 'duplicate' button will lead to an error: "Request-URI Too Long The requested URL's length exceeds the capacity limit for this server." Test plan: 1. Create a simple SQL report and add a lot of text into the notes field (the combined URL lenth must be >8225 characters) 2. Save the report 3. Press the duplicate the report from the saved reports page Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 19d9ba176dea6b7816a33b014a5f9e309af53dc0 Author: Fridolin Somers Date: Mon Jun 29 15:07:10 2020 +0200 Bug 23542: Fix SRU import encoding When importing records from a SRU server, the diacritics have bad encoding. I reproduce with BNF server so it may be a UNIMARC issue. Tests show that difference between Z39.50 server and SRU is that leader contains 'a' at postion 9. Looking at MARC::Record->encoding() shows that encoding depends on leader even for UNIMARC. So this patch adds a call to MARC::Record->encoding('UTF-8') in case of a SRU server in C4::Breeding. Same use exists in Koha::MetadataRecord::Authority::get_from_breeding(). In case of import via Z3950, MarcToUTF8Record() is called, which calls SetMarcUnicodeFlag(), which calls MARC::Record->encoding('UTF-8') Test plan : 1) Use a UNIMARC database 2) Configure a connexion to a UNIMARC SRU, for example BNF, see https://doc.biblibre.com/koha/autour_de_koha/serveurs_z3950_sru#serveur_de_la_bnf 3) Go to cataloguing module 4) Click on 'New from Z39.50/SRU' 5) Choose only the SRU target 6) Search for ISBN 2266072889 7) Confirm you see good encoding : diacritic on 'a' of title 'Strate-a-gemmes' 8) Click on 'Marc preview' 9) Confirm you see good encoding 10) Click import 11) Confirm you see good encoding 12) Check also Authorities import via SRU 13) Check also SRU imports on a MARC21 database Signed-off-by: Marcel de Rooy Amended: Removed change to new_from_xml call. We should respect syntax. But the added MARC::Record encoding does the tric! Which is implicit for Z3950 targets where MarcToUTF8Record does the same. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit a2b2426de842ac86048cbf71e3760b6483fc0b3c Author: Nick Clemens Date: Fri Jun 26 13:19:47 2020 +0000 Bug 25882: Remove phr indicator from limits when processing We assume all limits from advanced search to be a phrase and quote them when doing this we should remove the phrase marker to avoid doulbe quoting To test: 1 - Have koha using ES 2 - Go to advanced search 3 - Limit by a single itemtype that exists 4 - Get some results 5 - Limit by a different itemtype that exists 6 - Get some results 7 - Limit by both itemtypes 8 - Get only the results for the second itemtype 9 - Enable DumpTemplateVarsIntranet and DumpSearchQueryTemplate 10 - Repeat search 11 - View page source and find 'search_query' 12 - See limit looks like itype:("("BK")" OR "("CR")") 13 - Apply patches 14 - Restart all the things 15 - Repeat search for both itemtypes 16 - Note results now include both types Signed-off-by: Alex Arnaud Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 1a2d7f1eacc0722ea0723577823ee6a477a46b0a Author: Nick Clemens Date: Fri Jun 26 13:19:32 2020 +0000 Bug 25882: Unit test Signed-off-by: Alex Arnaud Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: C4/Breeding.pm | 2 + C4/Circulation.pm | 18 +- C4/Items.pm | 17 + Koha/CirculationRules.pm | 30 ++ Koha/RefundLostItemFeeRules.pm | 179 -------- Koha/SearchEngine/Elasticsearch/QueryBuilder.pm | 1 + acqui/neworderempty.pl | 4 +- admin/columns_settings.yml | 57 +++ admin/smart-rules.pl | 6 +- catalogue/moredetail.pl | 6 +- catalogue/search.pl | 4 +- cataloguing/addbiblio.pl | 6 +- cataloguing/additem.pl | 4 +- debian/docs/koha-indexer.xml | 7 + debian/scripts/koha-indexer | 5 +- koha-tmpl/intranet-tmpl/js/browser.js | 10 + .../prog/en/includes/reports-toolbar.inc | 2 +- .../prog/en/modules/admin/columns_settings.tt | 6 + .../prog/en/modules/authorities/detail.tt | 8 +- .../intranet-tmpl/prog/en/modules/basket/basket.tt | 1 - .../prog/en/modules/catalogue/advsearch.tt | 10 + .../prog/en/modules/catalogue/detail.tt | 3 + .../prog/en/modules/catalogue/moredetail.tt | 2 +- .../prog/en/modules/members/memberentrygen.tt | 78 ++-- .../prog/en/modules/members/moremember.tt | 26 ++ koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt | 19 +- .../prog/en/modules/reports/catalogue_stats.tt | 56 ++- .../en/modules/reports/guided_reports_start.tt | 2 +- .../prog/en/modules/reports/orders_by_budget.tt | 21 +- .../prog/en/modules/tools/batchMod-del.tt | 18 +- .../prog/en/modules/tools/batchMod-edit.tt | 13 +- koha-tmpl/intranet-tmpl/prog/js/cart.js | 29 +- koha-tmpl/intranet-tmpl/prog/js/catalog.js | 4 +- koha-tmpl/intranet-tmpl/prog/js/members.js | 1 + .../bootstrap/css/bootstrap-theme-oai.css | 7 +- koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss | 7 +- .../opac-tmpl/bootstrap/en/modules/opac-basket.tt | 37 +- .../en/modules/opac-full-serial-issues.tt | 49 ++- .../bootstrap/en/modules/opac-serial-issues.tt | 9 +- members/moremember.pl | 2 + reports/guided_reports.pl | 33 +- t/db_dependent/Koha/CirculationRules.t | 127 +++++- .../Koha/SearchEngine/Elasticsearch/QueryBuilder.t | 9 +- t/db_dependent/RefundLostItemFeeRule.t | 459 --------------------- t/lib/TestBuilder.pm | 5 +- tools/batchMod.pl | 3 +- 46 files changed, 577 insertions(+), 825 deletions(-) delete mode 100644 Koha/RefundLostItemFeeRules.pm delete mode 100755 t/db_dependent/RefundLostItemFeeRule.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Aug 13 10:47:46 2020 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 13 Aug 2020 08:47:46 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v20.05.00-615-gc3b43d3156 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 c3b43d31565d464bae664a9167b374baf191c834 (commit) via 504228950f6c2167856289d0a39de0a92fb8a97b (commit) via 831296be7a1947fd8aeed64862dbad6358c9875f (commit) via 103e182a50d56858bbbfb159b8eba4f7d21954d4 (commit) via c0acc0f4b40254e445fde782f37ef31b39e44449 (commit) via d573e4c40cec94eaf0aa175cc8da74c94cf6c9ce (commit) via 2e818915bec60fd579ed17c45d19b1f32a18e743 (commit) via 27fb149673bf30eea38f1888159c866960aa0b54 (commit) via 38b05bcd2721d9e65d2b2f4a12a64b4fa7ead593 (commit) via 13d9bdc74417f337106070f85332a7ef24331878 (commit) via a923dccab30c2a87cd1f14b60280cf31f8c4f62e (commit) via 77d97dc60ef6663937207af5c9e237ef70de4229 (commit) via f32f92cb577e01d638b1adbc3f065b511eb77d4a (commit) via 4c01343a360419752f6c5e198ee22e6857b5d670 (commit) via 6d7e7fc066c93b3893527ec3de0e34b2fc4fe58f (commit) via ed6a65c1ddacaa80fe825056cc77c3a3170af683 (commit) via ca44a3f2ca82371bd6a2d731b7b4fd185d9fd93a (commit) via be719f30e4142e92d23f3a0566eca93f75224fc3 (commit) via f916269465df99818fb15c108820d3b666968d39 (commit) via 8b106ed9c4b0588502c6dd485de2aec6a80b32c6 (commit) via ba8eeca3865bfcd77717e7a225279d5fb77c9989 (commit) via 0dd05fc90a735b9e22359fcb461bdc9291e7a85f (commit) via 53bd7b4075bef3f9ddbf6aeec561d99579fdd6e7 (commit) via c6f819840a891e493582026c307797ef7d31c5f0 (commit) via f7fcd69a11d4914dc6f3212192d90a06ecab12c3 (commit) via 1af5b8a7d72c8e49f857907c85809a38ee5b1a07 (commit) via 3239993fb1f3eafb2eca4004d5bd9a74e9995c1e (commit) via ee8fe4d35127904e59038b6a5dd77a8096d98624 (commit) via ed3e4540d73c1c3009375ad339e09a2e676fa1bd (commit) via f0dad7ba511c5e387277ea5cbd6056c66f9fe4b1 (commit) via c6dfd6801f20b0faa5e2b6ea4f783a4e3233f2de (commit) via a86a1a74b98ed92e27e9f16d4336555dd763bce4 (commit) via ccc7b3c8947c190b511ce5535382e50793f24c26 (commit) via 6655961517b36c16b92ca5880f4dcf260ce4052f (commit) via b6f2c4ac2d714edc1e35e3eb7749f9bb512c1a62 (commit) via 7ebc85da16f5cbc48bf4041ef8b0cc9b1d794f9f (commit) via 453fd5ce9012e247d552e7f93c367e4810de0939 (commit) via 4f3a0a4b89c78c9fff1673787893067f66970cf4 (commit) via 0545feb876f3bc673ee7a5f4de2fc66644cb35c6 (commit) via 0570d1fd24fff4e23adc2f0de4e4f9bdc0a98d8f (commit) from 9b342c81a044baeb8220e8a80ad8349adf8ff5b0 (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 c3b43d31565d464bae664a9167b374baf191c834 Author: Jonathan Druart Date: Thu Aug 13 08:00:23 2020 +0000 Bug 16371: DBRev 20.06.00.023 Signed-off-by: Jonathan Druart commit 504228950f6c2167856289d0a39de0a92fb8a97b Author: Jonathan Druart Date: Thu Aug 13 09:57:27 2020 +0200 Bug 16371: Fix inconsistencies with timestamp The timestamp value needs to be updated for each quote returned by get_daily_quote (even when there is a match) Signed-off-by: Jonathan Druart commit 831296be7a1947fd8aeed64862dbad6358c9875f Author: Emmi Takkinen Date: Fri Jul 31 09:47:56 2020 +0300 Bug 16371: Combine get_daily_quote and get_daily_quote_for_interface This patch combines get_daily_quote and get_daily_quote_for_interface methods and moves them from Koha::Quote to Koha::Quotes. Also removes some unused code and adjusts datetime parsing. To test apply this patch and confirm 'QuoteOfTheDay' syspref still works as expected (quote is shown in correct mainpage(s)). Also prove t/db_dependent/Koha/Quotes.t Sponsored-by: Koha-Suomi Oy Signed-off-by: Jonathan Druart commit 103e182a50d56858bbbfb159b8eba4f7d21954d4 Author: Emmi Takkinen Date: Wed Aug 12 09:16:43 2020 +0300 Bug 16371: Remove GetDailyQuote tests from Koha.t Tests in Koha.t failed due GetDailyQuote tests. This patch removes these tests since we test quotes in Quotes.t instead. To test prove t/db_dependent/Koha.t Sponsored-by: Koha-Suomi Oy Signed-off-by: Jonathan Druart commit c0acc0f4b40254e445fde782f37ef31b39e44449 Author: Emmi Takkinen Date: Tue Jul 7 15:45:17 2020 +0300 Bug 16371: Rewrite get_daily_quote An updated test plan: 1. Apply the patch(es). 2. Run the database update (updatedatabase on koha-testing-docker). 3. Check that the 'QuoteOfTheDay' system preference options work as expected: - OPAC: QOTD only appears in the OAPC - Staff interface: QOTD only appears in the staff interface - Both (Select all): QOTD appears in the staff interface and OPAC 4. Run the tests and make sure they pass: prove t/db_dependent/Koha/Quotes.t 5. Sign off! Sponsored-by: Koha-Suomi Oy Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit d573e4c40cec94eaf0aa175cc8da74c94cf6c9ce Author: Emmi Takkinen Date: Fri Jul 10 10:20:56 2020 +0300 Bug 16371: Add database updates Sponsored-by: Koha-Suomi Oy Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 2e818915bec60fd579ed17c45d19b1f32a18e743 Author: Emmi Takkinen Date: Thu Jul 9 11:55:03 2020 +0300 Bug 16371: Fix QA issues, change terminology Sponsored-by: Koha-Suomi Oy Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 27fb149673bf30eea38f1888159c866960aa0b54 Author: Emmi Takkinen Date: Mon Apr 27 08:55:38 2020 +0300 Bug 16371: Fix tests Tests failed due ids already existing in 'quotes' table. This patch removes hardcoded ids from tests. Sponsored-by: Koha-Suomi Oy Signed-off-by: David Nind Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 38b05bcd2721d9e65d2b2f4a12a64b4fa7ead593 Author: Emmi Takkinen Date: Tue Apr 14 12:51:50 2020 +0300 Bug 16371: Use multi-select on syspref This patch replaces textbox with multi-select dropdown on syspref 'QuoteOfTheDay' and changes tests to match this change. To test: 1. Check 'OPAC', 'staff client' or both on 'QuoteOfTheDay'. 2. Make sure that quote is displayed on (both) mainpage(s). Prove t/db_dependent/Koha/Quotes.t Sponsored-by: Koha-Suomi Oy Signed-off-by: David Nind Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 13d9bdc74417f337106070f85332a7ef24331878 Author: Olli-Antti Kivilahti Date: Mon Apr 25 11:22:04 2016 +0300 Bug 16371: Quote of the Day (QOTD) - Display in different interfaces Set 'QuoteOfTheDay'-syspref to 'opac intranet' to allow displaying news in the opac and the staff client. Add 'commandline' to allow news in the commandline (where applicable) Accepts all values accepted by the C4::Context->interface() Test plan: 1. Set 'QuoteOfTheDay' syspref as 'intranet' or 'opac' or both 2. Check that quote is visible on both mainpages Prove t/db_dependent/Koha/Quotes.t Sponsored-by: Koha-Suomi Oy Signed-off-by: David Nind Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit a923dccab30c2a87cd1f14b60280cf31f8c4f62e Author: Emmi Takkinen Date: Tue Apr 7 11:53:17 2020 +0300 Bug 16371: Add needed Koha::Exception Add Koha::Exception needed in this bug. Sponsored-by: Koha-Suomi Oy Signed-off-by: David Nind Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 77d97dc60ef6663937207af5c9e237ef70de4229 Author: Emmi Takkinen Date: Mon Apr 20 15:20:18 2020 +0300 Bug 16371: Rename test file Signed-off-by: David Nind Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit f32f92cb577e01d638b1adbc3f065b511eb77d4a Author: Emmi Takkinen Date: Fri Apr 17 11:28:55 2020 +0300 Bug 16371: Move GetDailyQuote to get_daily_quote This patch moves subroutine 'GetDailyQuote' to new Koha::Quote object and adjusts tests. To test: 1. Set 'QuoteOfTheDay' as 'enable' 2. Check that quote is displayed on OPAC mainpage Prove t/db_dependent/Koha/GetDailyQuote.t Sponsored-by: Koha-Suomi Oy Signed-off-by: David Nind Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 4c01343a360419752f6c5e198ee22e6857b5d670 Author: Emmi Takkinen Date: Fri Apr 17 10:57:27 2020 +0300 Bug 16371: Add Koha::Quote[s] classes Sponsored-by: Koha-Suomi Oy Signed-off-by: David Nind Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 6d7e7fc066c93b3893527ec3de0e34b2fc4fe58f Author: Tomas Cohen Arazi Date: Tue Aug 11 12:41:57 2020 -0300 Bug 25348: (QA follow-up) Silence irrelevant warnings Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit ed6a65c1ddacaa80fe825056cc77c3a3170af683 Author: Kyle M Hall Date: Fri May 1 12:24:44 2020 -0400 Bug 25348: Add support for circulation status 12 ( lost ) We should support the SIP2 "circulation status" value 12, "lost". Test Plan: 1) Apply this patch 2) prove t/db_dependent/SIP/Transaction.t Signed-off-by: David Nind Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit ca44a3f2ca82371bd6a2d731b7b4fd185d9fd93a Author: Kyle M Hall Date: Fri May 1 12:16:48 2020 -0400 Bug 25347: Add support for circulation status 11 ( claimed returned ) Now that we have return claims in Koha, we should support the SIP2 "circulation status" value 11, "claimed returned". Test Plan: 1) Apply this patch 2) prove t/db_dependent/SIP/Transaction.t Signed-off-by: David Nind Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit be719f30e4142e92d23f3a0566eca93f75224fc3 Author: Kyle M Hall Date: Fri May 1 12:04:37 2020 -0400 Bug 25344: Add support for circulation status 10 ( item in transit ) We should support the SIP2 "circulation status" value 10, "in transit between library locations" Test Plan: 1) Apply this patch 2) prove t/db_dependent/SIP/Transaction.t Signed-off-by: David Nind Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit f916269465df99818fb15c108820d3b666968d39 Author: Tomas Cohen Arazi Date: Fri Jul 31 11:14:20 2020 -0300 Bug 26114: ILL should mark status=RET only if a return happened The original code assumed every codepath should be trated as a successful check-in. Such is not the case and the regression tests verify that the code acknowledges this. To test: 1. Apply the regression tests patch 2. Run: $ kshell k$ prove t/db_dependent/Illrequests.t => FAIL: Tests fail 3. Apply this patch 4. Repeat 2 => SUCCESS: Tests pass! 5. Sign off :-D Signed-off-by: Tomas Cohen Arazi Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart commit 8b106ed9c4b0588502c6dd485de2aec6a80b32c6 Author: Tomas Cohen Arazi Date: Fri Jul 31 11:14:09 2020 -0300 Bug 26114: Regression tests Signed-off-by: Tomas Cohen Arazi Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart commit ba8eeca3865bfcd77717e7a225279d5fb77c9989 Author: Tomas Cohen Arazi Date: Wed Aug 12 14:44:52 2020 -0300 Bug 26132: (QA follow-up) Make tests more robust Tests fail is SearchEngine is set to Elasticsearch. This patch makes tests build 'real' biblios. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 0dd05fc90a735b9e22359fcb461bdc9291e7a85f Author: Nick Clemens Date: Tue Aug 4 19:01:30 2020 +0000 Bug 26132: (follow-up) Count all checkouts if no limits needed Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 53bd7b4075bef3f9ddbf6aeec561d99579fdd6e7 Author: Jonathan Druart Date: Tue Aug 4 12:22:06 2020 +0200 Bug 26132: Tidy _check_max_qty This is only a perltidy of _check_max_qty to remove some space inconsistencies, like: if( $max_checkouts_allowed eq '' ){ return;} if ( $checkout_count - $onsite_checkout_count >= $max_checkouts_allowed ) { Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit c6f819840a891e493582026c307797ef7d31c5f0 Author: Jonathan Druart Date: Tue Aug 4 12:21:26 2020 +0200 Bug 26132: Don't prefetch if not needed We only need to prefetch items if CircControl is set to ItemHomeLibrary Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit f7fcd69a11d4914dc6f3212192d90a06ecab12c3 Author: Jonathan Druart Date: Tue Aug 4 12:12:56 2020 +0200 Bug 26132: Remove raw SQL query for patron_maxissueqty Same as before but for patron_maxissueqty Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 1af5b8a7d72c8e49f857907c85809a38ee5b1a07 Author: Jonathan Druart Date: Tue Aug 4 12:05:53 2020 +0200 Bug 26132: Remove raw sql query Making use of Koha::Checkouts make the code much more readable here. It fixes 2 flaws: * $type was not quote escaped * the effective itemtype was not used which could lead to wrong calculation (for instance item-level_itypes is set but the item does not have the itype defined) However there is something to note, we are going to make things a bit less effective as we are now fetching the items to get their effective itemtype (vs a SUM done at DB level) Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 3239993fb1f3eafb2eca4004d5bd9a74e9995c1e Author: Jonathan Druart Date: Mon Aug 3 18:25:10 2020 +0200 Bug 26132: TooMany refactoring The different calls to _check_max_qty can be improved to highlight what is really changing between each of them. Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit ee8fe4d35127904e59038b6a5dd77a8096d98624 Author: Jonathan Druart Date: Thu Aug 13 10:14:49 2020 +0200 Bug 21946: DBIC schema changes Signed-off-by: Jonathan Druart commit ed3e4540d73c1c3009375ad339e09a2e676fa1bd Author: Jonathan Druart Date: Thu Aug 13 08:00:23 2020 +0000 Bug 21946: DBRev 20.06.00.022 Signed-off-by: Jonathan Druart commit f0dad7ba511c5e387277ea5cbd6056c66f9fe4b1 Author: Jonathan Druart Date: Tue Aug 4 10:39:24 2020 +0200 Bug 21946: Restore defined vs "" The tests still pass. Was the original change really useful? Signed-off-by: Jonathan Druart commit c6dfd6801f20b0faa5e2b6ea4f783a4e3233f2de Author: Nick Clemens Date: Mon Aug 3 12:27:15 2020 +0000 Bug 21946: (follow-up) Restore join to biblioitems Signed-off-by: Jonathan Druart commit a86a1a74b98ed92e27e9f16d4336555dd763bce4 Author: Nick Clemens Date: Wed Jul 29 12:08:22 2020 +0000 Bug 21946: (follow-up) Add a hint Signed-off-by: Jonathan Druart commit ccc7b3c8947c190b511ce5535382e50793f24c26 Author: Owen Leonard Date: Tue Jul 28 13:17:54 2020 +0000 Bug 21946: (follow-up) Add optgroup label in circ rules This patch adds a label to the optgroup showing child itemtypes in the circulation and fine rules interface. The parent itemtype description is the optgroup label, and then the parent itemtype is repeated as an