From gitmaster at git.koha-community.org Mon Apr 1 14:16:16 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 01 Apr 2019 12:16:16 +0000 Subject: [koha-commits] main Koha release repository branch 18.11.x updated. v18.11.04-21-g16e2505 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, 18.11.x has been updated via 16e250542de43eadf62bc9354329912be84c3420 (commit) via d5aa7655a643a5a4868a47b8aae5371438993580 (commit) via 38bbe82aa07aa9a1a3cc33e00b5b8e459eb28a30 (commit) via 34e0f9874f91b22c8fd24f76de74bb3c126d2a1e (commit) via e3e64974d830a8699e8648a82d21a7ffce502955 (commit) via 3b423071227ee3f9300907bb9e89cff26012aa29 (commit) via 54de33967101173c72865e97fce0fd220e2d0842 (commit) via ac1fdfe2258940cf4b7003d816b0e1723ed8963c (commit) via df86121423c4770fe6d4971efeb5341e5a0b8825 (commit) via 4c095218790767f14a9edae4386174b53a752b44 (commit) via 9ef8a3e328e281bef98fe33a50f975322c26c25a (commit) via c1d1880aeaf58052bc7782b30f57745a4bb78045 (commit) via aa631b60e49f128bf7bbbe91e248f0af03e5f656 (commit) via e180d8f46074a5088d517b154cd34526f3466d96 (commit) via 49d3cd6a7bcca45fbd5954ee49a4d13ba6224f22 (commit) via b875f2668d9605b90d7d2acb0ea8ec4da2f62fec (commit) via 58497e1bc5de57fa1a9c20a7502714cc9e2bd3fd (commit) via 70d465be6a43b45807b769725b48d5654c606e71 (commit) via f4d9c3ae9f79b40eadae34b74b78adbb4ae43a06 (commit) via 6826b12c74a345e50306add57061493beab7096b (commit) via a0cefc86535244b0a603506daf5633a096d5c043 (commit) from 319ef905cdb6724e605fab0365580248b9c3c61c (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 16e250542de43eadf62bc9354329912be84c3420 Author: Julian Maurice Date: Fri Mar 8 10:12:50 2019 +0100 Bug 21049: Set 007/00 when selecting material type (Rancor) There is a 1-1 relationship between the material type values and the position 00 of 007 field. Selecting a material type should set this position's value. Signed-off-by: Liz Rea Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 856425db1e156ee4faf1aae70b0a78845711ba43) Signed-off-by: Martin Renvoize commit d5aa7655a643a5a4868a47b8aae5371438993580 Author: Julian Maurice Date: Wed Mar 6 08:43:18 2019 +0100 Bug 21049: Fix value of material select for Rancor 007 widget The material type is selected in accordance with position 0 of 007 Test plan: 1. Create a new record using the advanced editor 2. Select a material type for field 007 and set at least the position 0 of this field 3. Save the record and reload the page 4. The material type should remain selected 5. Try with all available material types Signed-off-by: Liz Rea Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit e85294a738da7cce2a4897998ffa795f977b4cd7) Signed-off-by: Martin Renvoize commit 38bbe82aa07aa9a1a3cc33e00b5b8e459eb28a30 Author: Owen Leonard Date: Tue Mar 19 12:41:26 2019 +0000 Bug 22536: Display problem in Holds to Pull report This patch modifies the display of several values in the holds to pull report so that they can be displayed as lists instead of as chunks of HTML generated in SQL. This patch modifies the SQL in pendingreserves.pl so that values can be formatted in the same way that holding branch is. The better long-term solution is to remove SQL from pendingreserves.pl altogether, but this is a quick fix. This patch also makes a couple of minor markup changes to fix validation. To test, apply the patch and go to Circulation -> Holds to pull. To see the changes the patch makes your holds to pull list should have titles with multiple items at multiple branches, with call number, copy number, and enumeration data. These values should all be displayed in bulleted lists. Signed-off-by: David Roberts Signed-off-by: Bin Wen Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 9a321c128fed457bf6d11d2ce7ee7edf7dd28004) Signed-off-by: Martin Renvoize commit 34e0f9874f91b22c8fd24f76de74bb3c126d2a1e Author: Owen Leonard Date: Fri Mar 22 13:19:51 2019 +0000 Bug 22560: Forgotten password "token expired" page still shows boxes to reset password This patch modifies the OPAC password recovery template so that the new password entry form doesn't appear if the patron has followed an invalid or expired link. This patch also corrects the markup in the page title. To test, apply the patch and follow the process for resetting a forgotten password. When you follow the password recovery link, modify the URL so that the "uniqueKey" parameter is different. The page should show an error message. The password entry form should not appear. Check the page title in the browser's title bar. It should look correct. https://bugs.koha-community.org/show_bug.cgi?id=22520 Signed-off-by: Liz Rea Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit 7ac1457ffc27cf6ec5a3a7bab6abc8a010e02b6a) Signed-off-by: Martin Renvoize commit e3e64974d830a8699e8648a82d21a7ffce502955 Author: Owen Leonard Date: Fri Mar 22 12:57:31 2019 +0000 Bug 22561: Forgotten password requirements hint doesn't list all rules for new passwords This patch modifies a few templates in the OPAC so that all available information on password requirements is displayed for each case where the patron is setting a password: - If the RequireStrongPassword system preference is set, a message should appear listing strong password requirements and minimum password length. - If RequireStrongPassword is not set, the message should only ask for a minimum password length. To test, apply the patch and enable the PatronSelfRegistration and OpacResetPassword preferences. On the following pages, test with RequireStrongPassword both on and off. The correct messages should appear. - OPAC -> Forgot password. Follow the process to reset your password until you reach the step where you are entering the new password. - OPAC -> Register here. Check the password section of the registration form. - OPAC -> Log in -> Change your password. Signed-off-by: Liz Rea Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit 50be1c4006e0a1d7e3b537bd849bc77f7a6bb56f) Signed-off-by: Martin Renvoize commit 3b423071227ee3f9300907bb9e89cff26012aa29 Author: Tomas Cohen Arazi Date: Wed Feb 20 11:26:40 2019 -0300 Bug 17746: (QA follow-up) Make set_password.pl generate a password if required This patch makes the set_password.pl script generate the password if it is not passed as an argument. It also changes the behaviour of set_password.pl: it will now print the userid and password (generated or not) to mimick the behaviour from koha-reset-passwd. The koha-reset-passwd gets simplified as it doesn't generate the random password anymore, it passes the responsability to set_password.pl To test: - Follow the steps from the original platch - Verify all behaves as expected Signed-off-by: Tomas Cohen Arazi Signed-off-by: Liz Rea Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 3ef48c8708736e9d5b16e462e520302c007cb4c1) Signed-off-by: Martin Renvoize commit 54de33967101173c72865e97fce0fd220e2d0842 Author: Tomas Cohen Arazi Date: Mon Feb 4 15:09:34 2019 -0300 Bug 17746: Add misc/admin/set_password.pl script This patch introduces a script that allows changing a patron's password. The change overrides the defined password enforcement policy. If multiple conditions are passed to match on the patron, they all need to match. Otherwise an error message is printed. Attributes to search the patron on: - cardnumber - patron_id (a.k.a. borrowernumber) - userid we usually know some of them, but if we specify more than one, they need to match a patron, together. To test: 1) Apply this patch 2) Have a known patron (i.e. you know the cardnumber, the borrowernumber and the userid). 3) Run: $ kshell k$ perl misc/admin/set_password.pl --cardnumber \ --password a_password 4) Verify you can login with the new password 5) Repeat 3) through 5) with --patron_id and --userid => SUCCESS: You can login in all cases 6) Try combining some or all the parameters => SUCCESS: It fails when it should, it succeeds when it should 7) Sign off :-D Signed-off-by: Pierre-Marc Thibault Signed-off-by: Liz Rea Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit e2f6542e1ebbd15977b47c86d2a9ef55fa0c5e9b) Signed-off-by: Martin Renvoize commit ac1fdfe2258940cf4b7003d816b0e1723ed8963c Author: Tomas Cohen Arazi Date: Tue Feb 5 14:04:12 2019 -0300 Bug 17746: Make koha-reset-passwd user set_password.pl Signed-off-by: Tomas Cohen Arazi Signed-off-by: Liz Rea Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 0cd4ca289bd2e1bd11fdbd015225a909971ce213) Signed-off-by: Martin Renvoize commit df86121423c4770fe6d4971efeb5341e5a0b8825 Author: Owen Leonard Date: Wed Mar 20 16:24:42 2019 +0000 Bug 22550: OPAC suggestion form doesn't require mandatory fields Test plan: 1. OPAC->login->your purchase suggestions->New purchase suggestion 2. Click button "Submit your suggestion" directly without filling in any field. Empty suggestion record was added succeffully. 3. Apply the patch. 4. Click button "Submit your suggestion" directly without filling in any field. The required fields should be labeled in red. (you can change the mandatory fields by preference 'OPACSuggestionMandatoryFields') Signed-off-by: Bin Wen Signed-off-by: Jogiraju,T. Signed-off-by: Jogiraju,T. Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 28e7f1d4e7a114b04d6940463f47351466a638dd) Signed-off-by: Martin Renvoize commit 4c095218790767f14a9edae4386174b53a752b44 Author: Ere Maijala Date: Tue Mar 12 11:29:33 2019 +0200 Bug 22495: Restore Elasticsearch mapping for su-geo Test plan: 1. Reset mappings 2. Run perl misc/search_tools/rebuild_elastic_search.pl -d -b -v 3. Do a search and verify that the Places facet works Signed-off-by: Jonathan Druart Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 53b059afbb5731373a92a3ebaaceea4e1d656363) Signed-off-by: Martin Renvoize commit 9ef8a3e328e281bef98fe33a50f975322c26c25a Author: Ere Maijala Date: Mon Dec 17 16:22:58 2018 +0200 Bug 21974: Make Elasticsearch connection settings configurable Default settings are appended in get_elasticsearch_params so that there's a central place for them. Defaults can be overridden in koha-conf.xml. Test plan: 1. Verify that searches still work with the patch applied. 2. Verify that search fails after adding the following under in koha-conf.xml: Static 3. Verify that search fails after adding the following under in koha-conf.xml: FOO Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 65f35447e93008810cec3eba63a286b9940d5824) Signed-off-by: Martin Renvoize commit c1d1880aeaf58052bc7782b30f57745a4bb78045 Author: Nick Clemens Date: Mon Mar 25 12:58:39 2019 +0000 Bug 21622: (RM follow-up) adjust for changes from bug 21282 Signed-off-by: Nick Clemens (cherry picked from commit 18f9c3eb514f5733c55d92b16bd0f38d29161290) Signed-off-by: Martin Renvoize commit aa631b60e49f128bf7bbbe91e248f0af03e5f656 Author: Jonathan Druart Date: Wed Feb 27 14:49:35 2019 -0300 Bug 21998: Silent tests Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit e9fa69ca64e78cc9ea540e3fed1e9ffb1b3488fe) Signed-off-by: Martin Renvoize commit e180d8f46074a5088d517b154cd34526f3466d96 Author: Josef Moravec Date: Tue Dec 18 11:53:21 2018 +0000 Bug 21998: Throw exception on bad pattern Signed-off-by: Josef Moravec Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit ee73d577ed564d98e77cf25fcdadcbc594f7217c) Signed-off-by: Martin Renvoize commit 49d3cd6a7bcca45fbd5954ee49a4d13ba6224f22 Author: Marcel de Rooy Date: Wed Sep 19 15:36:36 2018 +0200 Bug 21998: Add pattern parameter in Koha::Token Allow a pattern too in Koha::Token->generate. Only supported length. Does not affect CSRF calls. So tiny change without further impact. Test plan: Run t/Token.t Signed-off-by: Marcel de Rooy Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit b794643bb075c0aa5de81f2481ae1df56f674309) Signed-off-by: Martin Renvoize commit b875f2668d9605b90d7d2acb0ea8ec4da2f62fec Author: Josef Moravec Date: Tue Feb 26 09:16:05 2019 +0000 Bug 19661: (follow-up) Use Basic auth in tests Test plan: prove t/db_dependent/api/v1/acquisitions_funds.t Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 48484173e26bf9859984860a17089f09de5c8b6a) Signed-off-by: Martin Renvoize commit 58497e1bc5de57fa1a9c20a7502714cc9e2bd3fd Author: Matthias Meusburger Date: Tue Jan 15 10:46:04 2019 +0100 Bug 19661: Add and change properties and parameters to conform to the funds RFC. Also, perform an exact search when searching on the fund owner id. Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 6e98cc4503cedba411371d4005be41b5822569c8) Signed-off-by: Martin Renvoize commit 70d465be6a43b45807b769725b48d5654c606e71 Author: Matthias Meusburger Date: Wed Jan 17 11:49:14 2018 +0100 Bug 19661: Use Koha::Acquisition::Funds instead of C4::Budgets Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit b6be4024196c9e62363eabf0d2ad0b9f9141d15c) Signed-off-by: Martin Renvoize commit f4d9c3ae9f79b40eadae34b74b78adbb4ae43a06 Author: Matthias Meusburger Date: Thu Oct 12 07:55:12 2017 +0000 Bug 19661: REST API - Funds Endpoint This patch adds a new route to the REST api: /api/v1/acquisitions/funds/ Signed-off-by: David Bourgault Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 717975abebe938a5e79ffc07055ed6190b43f206) Signed-off-by: Martin Renvoize commit 6826b12c74a345e50306add57061493beab7096b Author: Nick Clemens Date: Fri Mar 22 19:20:55 2019 +0000 Bug 21948: Compiled CSS Signed-off-by: Nick Clemens (cherry picked from commit 7a9a8f2f08e4b74af712d59e1f1f9f0a7b3205a0) Signed-off-by: Martin Renvoize commit a0cefc86535244b0a603506daf5633a096d5c043 Author: Owen Leonard Date: Tue Dec 4 19:53:29 2018 +0000 Bug 21948: Clean up style of item detail page This patch removes some page-specific style from the item detail page in the staff client and adds some markup in order to trigger a more generally-used style. This patch also adds a font-awesome icon to the "Edit item" link on the page. To test, apply the patch and regenerate the staff client CSS. Open a bibliographic record and view the "Items tab." Signed-off-by: Hayley Mapley Signed-off-by: Nick Clemens (cherry picked from commit 32020105e8494ba82a8a505711c5047560c9d304) Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: .../BasketGroups.pm => Exceptions/Token.pm} | 35 +++-- Koha/REST/V1/Acquisitions/Funds.pm | 134 ++++++++++++++++++++ Koha/SearchEngine/Elasticsearch.pm | 13 +- Koha/Token.pm | 22 +++- acqui/ordered.pl | 2 +- acqui/spent.pl | 4 +- admin/searchengine/elasticsearch/mappings.yaml | 19 +++ api/v1/swagger/definitions.json | 3 + api/v1/swagger/definitions/fund.json | 101 +++++++++++++++ api/v1/swagger/parameters.json | 5 +- api/v1/swagger/parameters/fund.json | 9 ++ api/v1/swagger/paths.json | 3 + api/v1/swagger/paths/acquisitions_funds.json | 73 +++++++++++ api/v1/swagger/x-primitives.json | 6 + circ/pendingreserves.pl | 12 +- debian/scripts/koha-reset-passwd | 61 ++++++--- .../intranet-tmpl/lib/koha/cateditor/widget.js | 2 +- .../intranet-tmpl/prog/css/src/staff-global.scss | 16 --- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +- .../prog/en/includes/cateditor-widgets-marc21.inc | 33 ++++- .../prog/en/modules/catalogue/moredetail.tt | 12 +- .../prog/en/modules/circ/pendingreserves.tt | 51 +++++++- .../bootstrap/en/modules/opac-memberentry.tt | 8 +- .../opac-tmpl/bootstrap/en/modules/opac-passwd.tt | 7 +- .../bootstrap/en/modules/opac-password-recovery.tt | 12 +- .../bootstrap/en/modules/opac-suggestions.tt | 2 +- misc/admin/set_password.pl | 129 +++++++++++++++++++ t/Token.t | 14 +- t/db_dependent/api/v1/acquisitions_funds.t | 84 ++++++++++++ 29 files changed, 781 insertions(+), 93 deletions(-) copy Koha/{Acquisition/BasketGroups.pm => Exceptions/Token.pm} (57%) create mode 100644 Koha/REST/V1/Acquisitions/Funds.pm create mode 100644 api/v1/swagger/definitions/fund.json create mode 100644 api/v1/swagger/parameters/fund.json create mode 100644 api/v1/swagger/paths/acquisitions_funds.json create mode 100755 misc/admin/set_password.pl create mode 100644 t/db_dependent/api/v1/acquisitions_funds.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Apr 1 16:27:23 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 01 Apr 2019 14:27:23 +0000 Subject: [koha-commits] main Koha release repository branch 18.11.x updated. v18.11.04-35-g1c31c10 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, 18.11.x has been updated via 1c31c10539d2393ab640e103fe8829e6422e4717 (commit) via a7738f6177477baef332ddf8b13d85d1186e8cf6 (commit) via a1ff8ba5e1de2047e8e5ee6afd268a7c2a889e91 (commit) via 22d46b5d307f64fb7a4e2a553624ed42e6566bab (commit) via 9cf4f1a30d0aeb62bd3c37504c6ab447bedf778e (commit) via 701aec8443e99268f12ad0a3f54c48cee16b9d7d (commit) via ab1895b1adc2d2175907e2ca922b22df00dec3fe (commit) via 1a4a1170eedc79723cf46f6b44f82198702330e2 (commit) via 8192499d5b5e72a3d3ced773378dfa9f8df82dba (commit) via cb724e71474b7d4f998a1a4996c9971ac9a86de2 (commit) via 3736f2f1888d246947c09f220a9db474b0452c36 (commit) via 0a1b3d10843c6e9dcfd208810dfc24c224f29647 (commit) via 34dba63bfe8d6ce4b5b1838b07581b629cac9f33 (commit) via b37bb2bbada259602c4f66922bd673d4dbcc4438 (commit) from 16e250542de43eadf62bc9354329912be84c3420 (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 1c31c10539d2393ab640e103fe8829e6422e4717 Author: Nick Clemens Date: Fri Mar 29 13:17:14 2019 +0000 Bug 13895: (follow-up) Add Modern::Perl Signed-off-by: Nick Clemens (cherry picked from commit 94206510d7a7641e0e283738f56249c90f7d632e) Signed-off-by: Martin Renvoize commit a7738f6177477baef332ddf8b13d85d1186e8cf6 Author: Lucas Gass Date: Tue Mar 26 11:17:31 2019 +0000 Bug 22586: IntranetReportsHomeHTML no longer renders as HTML on reports-home.pl As of 18.11 the IntranetReportsHomeHTML syspref no longer renders HTML on report-home.pl. I think this is being filtered wrong in the template. Test Plan: 1) Edit IntranetReportsHomeHTML, set to "

Test

" 2) View a report, note that you see the html p tags are displayed litterly 3) Apply this patch 4) Reload the page 5) Note the p tags are rendered as html Signed-off-by: George Williams Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens (cherry picked from commit 7aaa10e0922b21f1c9ed40ede0d3dfc0a63c2832) Signed-off-by: Martin Renvoize commit a1ff8ba5e1de2047e8e5ee6afd268a7c2a889e91 Author: Fridolin Somers Date: Wed Mar 27 15:37:51 2019 +0100 Bug 22596: use raw TT filter in items search with custom field When items search is with a custom field using authorised values, html TT filter is breaking the JS, it should use raw. Test plan : 1) Go to Administration > Item search fields 2) Define a search field with an authorised values category 3) Go to items search 4) Use the "New field" link 5) Check use of custom field is OK Signed-off-by: Liz Rea Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens (cherry picked from commit eb7e0f018c479024f0ceacb9f0c235b556ec2979) Signed-off-by: Martin Renvoize commit 22d46b5d307f64fb7a4e2a553624ed42e6566bab Author: Tomas Cohen Arazi Date: Wed Mar 27 14:23:18 2019 -0300 Bug 13895: (QA follow-up) Make the class plural Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit eabcec1d6c172e0e590aa497eae0c264bcd2b5dc) Signed-off-by: Martin Renvoize commit 9cf4f1a30d0aeb62bd3c37504c6ab447bedf778e Author: Josef Moravec Date: Wed Mar 13 16:25:38 2019 +0000 Bug 13895: Fix test Signed-off-by: Nick Clemens (cherry picked from commit 583328e3f8c2e1827419185628069ad8c9979943) Signed-off-by: Martin Renvoize commit 701aec8443e99268f12ad0a3f54c48cee16b9d7d Author: Josef Moravec Date: Wed Mar 13 16:03:09 2019 +0000 Bug 13895: Adapt naming according to voted RFC Signed-off-by: Nick Clemens (cherry picked from commit a142369b309068ed2ba5d34f033f4e047483401d) Signed-off-by: Martin Renvoize commit ab1895b1adc2d2175907e2ca922b22df00dec3fe Author: Josef Moravec Date: Mon Feb 25 22:17:01 2019 +0000 Bug 13895: (follow-up) Fix POST response Test plan: prove t/db_dependent/api/v1/chcekouts.t Signed-off-by: Michal Denar Signed-off-by: Nick Clemens (cherry picked from commit 47ad7afccaf1ca0ae7b8dbfad9998aaac6d9a938) Signed-off-by: Martin Renvoize commit 1a4a1170eedc79723cf46f6b44f82198702330e2 Author: Josef Moravec Date: Thu Feb 21 00:26:17 2019 +0000 Bug 13895: Change renewal endpoint Instead of PUT on /checkout/{checkout_id} endpoint, you should now call POST on /checkouts/{checkout_id}/renewal Test plan: prove t/db_dependent/api/v1/checkouts.t Signed-off-by: Nick Clemens (cherry picked from commit 95d23bc3c38f3cd6a4e6be3aac451c3899cccc83) Signed-off-by: Martin Renvoize commit 8192499d5b5e72a3d3ced773378dfa9f8df82dba Author: Josef Moravec Date: Thu Feb 21 00:15:22 2019 +0000 Bug 13895: Refactor test using REST Basic auth Test plan: prove t/db_dependent/api/v1/checkouts.t Signed-off-by: Nick Clemens (cherry picked from commit a0148b440a4f05c6a6d216c85b03ea502b0da95b) Signed-off-by: Martin Renvoize commit cb724e71474b7d4f998a1a4996c9971ac9a86de2 Author: Josef Moravec Date: Wed Feb 20 21:42:36 2019 +0000 Bug 13895: Remove create_item and create_biblio subs from test Test plan: prove t/db_dependent/api/v1/checkouts.t Signed-off-by: Nick Clemens (cherry picked from commit a7e704382fa97ba08c8d2d57f6a818e76e858770) Signed-off-by: Martin Renvoize commit 3736f2f1888d246947c09f220a9db474b0452c36 Author: Josef Moravec Date: Wed Feb 20 21:30:49 2019 +0000 Bug 13895: Remove the opac checks in privileged endpoint Test plan: prove t/db_dependent/api/v1/checkouts.t Signed-off-by: Nick Clemens (cherry picked from commit 4672e6e6c40cf595da7e836525e5b6e486f78efe) Signed-off-by: Martin Renvoize commit 0a1b3d10843c6e9dcfd208810dfc24c224f29647 Author: Josef Moravec Date: Mon Feb 4 14:22:54 2019 +0000 Bug 13895: (follow-up) Adapt checkout endpoint to openapi, update terminology Signed-off-by: Nick Clemens (cherry picked from commit 1dfb57164fd6d986b110caa695a3baf9800ff93a) Signed-off-by: Martin Renvoize commit 34dba63bfe8d6ce4b5b1838b07581b629cac9f33 Author: Tomas Cohen Arazi Date: Fri Nov 10 16:16:49 2017 -0300 Bug 13895: (QA follow-up) Adjust OpenAPI definitions for checkouts Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit b63fd774c181b96e514122c0d693f222b99b1cdd) Signed-off-by: Martin Renvoize commit b37bb2bbada259602c4f66922bd673d4dbcc4438 Author: Julian Maurice Date: Mon Mar 23 13:10:46 2015 +0100 Bug 13895: Add API routes for checkouts retrieval and renewal GET /checkouts?borrowernumber={borrowernumber} GET /checkouts/{checkout_id} PUT /checkouts/{checkout_id} + unit tests in t/db_dependent/api/v1/checkouts.t Test plan: 1. Open a browser tab on Koha staff and log in (to create CGISESSID cookie). You should have permission circulate_remaining_permissions. 2. Go to http://yourlibrary/api/v1/checkouts?borrowernumber=XXX (replace XXX with a borrowernumber that has checkouts) and check you receive correct data 3. Go to http://yourlibrary/api/v1/checkouts/YYY (replace YYY with an existing checkout id) and check you receive correct data 4. Send PUT requests to http://yourlibrary/api/v1/checkouts/YYY until the maximum number of renewals is reached (you should have a 403 error) 5. Run unit tests in t/db_dependent/api/v1/checkouts.t Depends on bugs 16699 and 14868 Signed-off-by: Benjamin Rokseth Signed-off-by: Lari Taskula Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit e3f2e346f884e2ba6e4a8f43709955f776a259de) Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: Koha/REST/V1/Checkouts.pm | 211 ++++++++++++++++++++ Koha/Schema/Result/Issue.pm | 5 + api/v1/swagger/definitions.json | 6 + api/v1/swagger/definitions/checkout.json | 69 +++++++ .../definitions/{holds.json => checkouts.json} | 2 +- api/v1/swagger/parameters.json | 3 + api/v1/swagger/parameters/checkout.json | 9 + api/v1/swagger/paths.json | 9 + api/v1/swagger/paths/checkouts.json | 96 +++++++++ .../prog/en/modules/catalogue/itemsearch.tt | 2 +- .../prog/en/modules/reports/reports-home.tt | 3 +- t/db_dependent/api/v1/checkouts.t | 156 +++++++++++++++ 12 files changed, 568 insertions(+), 3 deletions(-) create mode 100644 Koha/REST/V1/Checkouts.pm create mode 100644 api/v1/swagger/definitions/checkout.json copy api/v1/swagger/definitions/{holds.json => checkouts.json} (58%) create mode 100644 api/v1/swagger/parameters/checkout.json create mode 100644 api/v1/swagger/paths/checkouts.json create mode 100644 t/db_dependent/api/v1/checkouts.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Apr 1 17:56:30 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 01 Apr 2019 15:56:30 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.11-7-g1212797 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, 18.05.x has been updated via 12127972ad15bfd71d764c4db5dd5afa7638f487 (commit) via 66550615441e84a00d5252018697baca20c5bf11 (commit) from c15a41bcddcd052d3e8f79af35cb2c4118e567a8 (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 12127972ad15bfd71d764c4db5dd5afa7638f487 Author: Josef Moravec Date: Wed Mar 20 15:52:07 2019 +0000 Bug 13763: (follow-up) Strip leading whitespace characters from input barcode this makes the work with barcodes from input consistant on checking out, checking in and renewing Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 28ff4f6393e65ebfca60c05611fafc926f1fb239) Signed-off-by: Martin Renvoize (cherry picked from commit 2712e1ee55208332db4ec01310f58b8fa0b882c6) Signed-off-by: Lucas Gass commit 66550615441e84a00d5252018697baca20c5bf11 Author: Hayley Mapley Date: Thu Mar 14 04:58:31 2019 +0000 Bug 13763: Added check for filter syspref in renew.pl In Circulation->Renew, the renew feature does not check the system preference itemBarcodeFilter to see whether the barcode needs to be converted. This patch fixes this, adding a check for the system pref and applying it accordingly to convert the barcode if it is needed. Test plan: 1) In Circulation->Renew, enter a barcode that you know exists in the catalogue but add extra spaces, breaking up the barcode. Note that this fails with a warning that says 'No item matches this barcode' 2) In system Preferences, set the itemBarcodeInputFilter pref to Remove spaces and repeat step1. Note that the result is the same as in step 1 3) Apply the patch 4) Repeat step 1, and note that the filter removes the spaces and the item is renewed (or gives an error that indicates it recognises the barcode) Sponsored-by: Catalyst IT Signed-off-by: Bin Wen Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 48e9082043115416063e66217db60f0054b68088) Signed-off-by: Martin Renvoize (cherry picked from commit 4505ad4dc52c5384866c157c08ba6a5a6c95a619) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: circ/renew.pl | 2 ++ 1 file changed, 2 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Apr 1 17:59:45 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 01 Apr 2019 15:59:45 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.11-9-gde8cf34 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, 18.05.x has been updated via de8cf34eb76d434b780032cb3bd812b5baff3444 (commit) via 3b01a0b0029a6ee01275a54efa294d9a03a9e5f4 (commit) from 12127972ad15bfd71d764c4db5dd5afa7638f487 (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 de8cf34eb76d434b780032cb3bd812b5baff3444 Author: Blou Date: Tue Sep 11 14:42:03 2018 -0400 Bug 21130: (Follow up OPAC Results) Prevent HTML class from being translated This fixes the same issue where "title" is being translated (in fr-CA at least) and thus break the javascript impacting the result display in the OPAC Signed-off-by: Hayley Mapley Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens (cherry picked from commit 5334e0f32a8b93c407c2bfc931397a0ae70b8d64) Signed-off-by: Martin Renvoize (cherry picked from commit afce1b2a92ba186db56ed225d2b242158be4bd0c) Signed-off-by: Lucas Gass commit 3b01a0b0029a6ee01275a54efa294d9a03a9e5f4 Author: David Bourgault Date: Fri Jul 27 17:13:42 2018 -0400 Bug 21130: Prevent HTML class from being translated Adds a xsl:value-of tag to prevent the value from being translated. TEST PLAN 0) Apply patch 1) Translate 2) In the opac, div.record has not changed NOTE: I don't know if this bug affects all translations, I noticed it when translating to fr-CA. The fix will work for all languages. Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens (cherry picked from commit e64fb90311a9f2b37b49fc670962089cbb3d32de) Signed-off-by: Martin Renvoize (cherry picked from commit 84787c1eee9db11f779273ba5f83ddd4d8f91efb) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Apr 1 18:03:35 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 01 Apr 2019 16:03:35 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.11-10-g8779029 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, 18.05.x has been updated via 87790299605e2d1fad5f781ebc7ff9b180294dbf (commit) from de8cf34eb76d434b780032cb3bd812b5baff3444 (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 87790299605e2d1fad5f781ebc7ff9b180294dbf Author: Katrin Fischer Date: Wed Feb 6 02:02:11 2019 +0000 Bug 13735: Update PrepareItemrecordDisplay to use maxlength The PrepareItemrecordDisplay method used to generate the item display on receiving serials was using a hardcoded maxlength of 255 on input fields. This patch updates it to use the maxlength defined in the frameworks instead as the normal item form does. To test: - Create or reuse an existing subscription - Make note of the framework the record uses - Add an item on receive - Check the maxlength on the various fields is set to 255 (check source code or use developer tools) - You can also verify that by adding a long note to one of the note fields - Apply patch - Repeat tests, the maxlength should now be 9999 - In your framework settings, change the length of one of the subfields to another value - Verify that the item form reflects the change Signed-off-by: Martin Renvoize Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens (cherry picked from commit 0429aadc217f05a98bbaa51f955b835ac552fd7a) Signed-off-by: Martin Renvoize (cherry picked from commit 1c267af1438d31a967593f942321d040cd26d34e) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: C4/Items.pm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Apr 1 18:41:44 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 01 Apr 2019 16:41:44 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.11-13-g9fe361a 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, 18.05.x has been updated via 9fe361a491ebf82697ab1e4b6d439f218f300623 (commit) via c6651b872421cce5415694fbf173c38a094c1321 (commit) via a12ad9f12260bed9732bcaa4b663c109a3b4572e (commit) from 87790299605e2d1fad5f781ebc7ff9b180294dbf (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 9fe361a491ebf82697ab1e4b6d439f218f300623 Author: Tomas Cohen Arazi Date: Wed Feb 20 11:26:40 2019 -0300 Bug 17746: (QA follow-up) Make set_password.pl generate a password if required This patch makes the set_password.pl script generate the password if it is not passed as an argument. It also changes the behaviour of set_password.pl: it will now print the userid and password (generated or not) to mimick the behaviour from koha-reset-passwd. The koha-reset-passwd gets simplified as it doesn't generate the random password anymore, it passes the responsability to set_password.pl To test: - Follow the steps from the original platch - Verify all behaves as expected Signed-off-by: Tomas Cohen Arazi Signed-off-by: Liz Rea Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 3ef48c8708736e9d5b16e462e520302c007cb4c1) Signed-off-by: Martin Renvoize (cherry picked from commit 3b423071227ee3f9300907bb9e89cff26012aa29) Signed-off-by: Lucas Gass commit c6651b872421cce5415694fbf173c38a094c1321 Author: Tomas Cohen Arazi Date: Mon Feb 4 15:09:34 2019 -0300 Bug 17746: Add misc/admin/set_password.pl script This patch introduces a script that allows changing a patron's password. The change overrides the defined password enforcement policy. If multiple conditions are passed to match on the patron, they all need to match. Otherwise an error message is printed. Attributes to search the patron on: - cardnumber - patron_id (a.k.a. borrowernumber) - userid we usually know some of them, but if we specify more than one, they need to match a patron, together. To test: 1) Apply this patch 2) Have a known patron (i.e. you know the cardnumber, the borrowernumber and the userid). 3) Run: $ kshell k$ perl misc/admin/set_password.pl --cardnumber \ --password a_password 4) Verify you can login with the new password 5) Repeat 3) through 5) with --patron_id and --userid => SUCCESS: You can login in all cases 6) Try combining some or all the parameters => SUCCESS: It fails when it should, it succeeds when it should 7) Sign off :-D Signed-off-by: Pierre-Marc Thibault Signed-off-by: Liz Rea Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit e2f6542e1ebbd15977b47c86d2a9ef55fa0c5e9b) Signed-off-by: Martin Renvoize (cherry picked from commit 54de33967101173c72865e97fce0fd220e2d0842) Signed-off-by: Lucas Gass commit a12ad9f12260bed9732bcaa4b663c109a3b4572e Author: Tomas Cohen Arazi Date: Tue Feb 5 14:04:12 2019 -0300 Bug 17746: Make koha-reset-passwd user set_password.pl Signed-off-by: Tomas Cohen Arazi Signed-off-by: Liz Rea Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 0cd4ca289bd2e1bd11fdbd015225a909971ce213) Signed-off-by: Martin Renvoize (cherry picked from commit ac1fdfe2258940cf4b7003d816b0e1723ed8963c) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: debian/scripts/koha-reset-passwd | 61 ++++++++++++------ misc/admin/set_password.pl | 129 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 171 insertions(+), 19 deletions(-) create mode 100755 misc/admin/set_password.pl hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Apr 1 18:51:30 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 01 Apr 2019 16:51:30 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.11-14-g061e95f 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, 18.05.x has been updated via 061e95f4b170053b395830e29d9c959abcb0bd43 (commit) from 9fe361a491ebf82697ab1e4b6d439f218f300623 (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 061e95f4b170053b395830e29d9c959abcb0bd43 Author: Owen Leonard Date: Fri Mar 22 12:57:31 2019 +0000 Bug 22561: Forgotten password requirements hint doesn't list all rules for new passwords This patch modifies a few templates in the OPAC so that all available information on password requirements is displayed for each case where the patron is setting a password: - If the RequireStrongPassword system preference is set, a message should appear listing strong password requirements and minimum password length. - If RequireStrongPassword is not set, the message should only ask for a minimum password length. To test, apply the patch and enable the PatronSelfRegistration and OpacResetPassword preferences. On the following pages, test with RequireStrongPassword both on and off. The correct messages should appear. - OPAC -> Forgot password. Follow the process to reset your password until you reach the step where you are entering the new password. - OPAC -> Register here. Check the password section of the registration form. - OPAC -> Log in -> Change your password. Signed-off-by: Liz Rea Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit 50be1c4006e0a1d7e3b537bd849bc77f7a6bb56f) Signed-off-by: Martin Renvoize (cherry picked from commit e3e64974d830a8699e8648a82d21a7ffce502955) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt | 8 ++++++-- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt | 7 ++++++- .../opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt | 8 ++++++-- 3 files changed, 18 insertions(+), 5 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Apr 1 18:55:53 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 01 Apr 2019 16:55:53 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.11-15-g3ade1f5 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, 18.05.x has been updated via 3ade1f52cd4ef73e44997726f8de56d0a9cac810 (commit) from 061e95f4b170053b395830e29d9c959abcb0bd43 (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 3ade1f52cd4ef73e44997726f8de56d0a9cac810 Author: Owen Leonard Date: Fri Mar 22 13:19:51 2019 +0000 Bug 22560: Forgotten password "token expired" page still shows boxes to reset password This patch modifies the OPAC password recovery template so that the new password entry form doesn't appear if the patron has followed an invalid or expired link. This patch also corrects the markup in the page title. To test, apply the patch and follow the process for resetting a forgotten password. When you follow the password recovery link, modify the URL so that the "uniqueKey" parameter is different. The page should show an error message. The password entry form should not appear. Check the page title in the browser's title bar. It should look correct. https://bugs.koha-community.org/show_bug.cgi?id=22520 Signed-off-by: Liz Rea Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit 7ac1457ffc27cf6ec5a3a7bab6abc8a010e02b6a) Signed-off-by: Martin Renvoize (cherry picked from commit 34e0f9874f91b22c8fd24f76de74bb3c126d2a1e) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Apr 1 18:59:37 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 01 Apr 2019 16:59:37 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.11-16-g9116cba 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, 18.05.x has been updated via 9116cba3506b1129ed4165734a18fb66b3b8191a (commit) from 3ade1f52cd4ef73e44997726f8de56d0a9cac810 (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 9116cba3506b1129ed4165734a18fb66b3b8191a Author: Owen Leonard Date: Tue Mar 19 12:41:26 2019 +0000 Bug 22536: Display problem in Holds to Pull report This patch modifies the display of several values in the holds to pull report so that they can be displayed as lists instead of as chunks of HTML generated in SQL. This patch modifies the SQL in pendingreserves.pl so that values can be formatted in the same way that holding branch is. The better long-term solution is to remove SQL from pendingreserves.pl altogether, but this is a quick fix. This patch also makes a couple of minor markup changes to fix validation. To test, apply the patch and go to Circulation -> Holds to pull. To see the changes the patch makes your holds to pull list should have titles with multiple items at multiple branches, with call number, copy number, and enumeration data. These values should all be displayed in bulleted lists. Signed-off-by: David Roberts Signed-off-by: Bin Wen Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 9a321c128fed457bf6d11d2ce7ee7edf7dd28004) Signed-off-by: Martin Renvoize (cherry picked from commit 38bbe82aa07aa9a1a3cc33e00b5b8e459eb28a30) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: circ/pendingreserves.pl | 12 ++--- .../prog/en/modules/circ/pendingreserves.tt | 51 +++++++++++++++++--- 2 files changed, 50 insertions(+), 13 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Apr 1 19:04:29 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 01 Apr 2019 17:04:29 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.11-18-gc8eee1b 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, 18.05.x has been updated via c8eee1b25761c5f3867fffc48c2e03ceab56e4ce (commit) via b25c4196b8174b375d8c13ccb8dee145c5d784b6 (commit) from 9116cba3506b1129ed4165734a18fb66b3b8191a (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 c8eee1b25761c5f3867fffc48c2e03ceab56e4ce Author: Julian Maurice Date: Fri Mar 8 10:12:50 2019 +0100 Bug 21049: Set 007/00 when selecting material type (Rancor) There is a 1-1 relationship between the material type values and the position 00 of 007 field. Selecting a material type should set this position's value. Signed-off-by: Liz Rea Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 856425db1e156ee4faf1aae70b0a78845711ba43) Signed-off-by: Martin Renvoize (cherry picked from commit 16e250542de43eadf62bc9354329912be84c3420) Signed-off-by: Lucas Gass commit b25c4196b8174b375d8c13ccb8dee145c5d784b6 Author: Julian Maurice Date: Wed Mar 6 08:43:18 2019 +0100 Bug 21049: Fix value of material select for Rancor 007 widget The material type is selected in accordance with position 0 of 007 Test plan: 1. Create a new record using the advanced editor 2. Select a material type for field 007 and set at least the position 0 of this field 3. Save the record and reload the page 4. The material type should remain selected 5. Try with all available material types Signed-off-by: Liz Rea Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit e85294a738da7cce2a4897998ffa795f977b4cd7) Signed-off-by: Martin Renvoize (cherry picked from commit d5aa7655a643a5a4868a47b8aae5371438993580) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/lib/koha/cateditor/widget.js | 2 +- .../prog/en/includes/cateditor-widgets-marc21.inc | 33 +++++++++++++++++++- 2 files changed, 33 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 5 15:24:49 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 05 Apr 2019 13:24:49 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-1025-g41e0ff7 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 41e0ff7cd6240c2c9ba2d1bec816b191ef091eb1 (commit) via 3eee6f3091fcb621152af7f4db6441c98cb74558 (commit) via c786e4de2369de34ce26610309cbce53534446d3 (commit) via 29dd8d62943c303c60284e0430b1b7230891b97a (commit) via fc188dfc825eb81fb6969305e8945b95138cbd41 (commit) via 8629a11601371a0c20505c5b1f70a45745068e02 (commit) via 54cf1df239e3b83ae5550e3ef499038dd5597d95 (commit) via 0e0a3173859d4374087e99e1a7cd929c8da61c76 (commit) via 05e49e6be98723f67ec85a5843fad1fc9787925f (commit) via 40503c8fa86e6c4480ec8ca59e28f0c6f394502d (commit) via b1c70a3c7e667137e54c88a2e02b5ca5ad5ee10b (commit) via ced69febf3de17691d885e9ee7e03ef46c28b2ae (commit) via cf95f0a7e6897d3dc4b90c92ffad19230379d7cb (commit) via a5fcd93f72687e946d9bfbdc2541ed4a18704125 (commit) via f6bc67e851722451a970d085f51fb11fb03e21b3 (commit) from 6666918dd661b0207366becefd1480257197a353 (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 41e0ff7cd6240c2c9ba2d1bec816b191ef091eb1 Author: Hayley Mapley Date: Thu Mar 7 20:28:48 2019 +0000 Bug 21003: Made Edit keywords more consistent in add_items-step2.tt When adding a course reserve with a barcode that already exists, the title, breadcrumbs, and legend of the form all specify that the user is editing, and not adding, the book. Test plan: Same as comment 1 Signed-off-by: Devinim Signed-off-by: Bin Wen Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 3eee6f3091fcb621152af7f4db6441c98cb74558 Author: Hayley Mapley Date: Thu Mar 7 02:50:12 2019 +0000 Bug 21003: Removed warning and changed wording on add_items-step2.tt When editing an item in a Course Reserve, the page displayed is the same that is displayed when adding an item to a Course Reserve. This patch removes the warning 'This course already has this item on reserve' when the item is being edited, as well as changes the title, breadcrumbs, and header of the div. This patch also Changes the header of the div to say 'Edit 'book_name' in 'course_name'' instead of 'Add 'book_name' to 'course_name'' when adding items to a course reserve if the item is already present. To test: 1) Create a new course in Course Reserves (you will need Course Reserves enabled in syspref) 2) Add an item by clicking the Add reserves button 3) Click the edit button on the right hand side of the item listing under the Reserves heading 4) Observe that the warning 'The course already has this item on reserve' appears, and that the title, breadcrumbs and header of the div all say Add/Reserve 5) Apply the patch 6) Repeat step 3 and observe that the title, breadcrumbs and header of the div now say Edit 7) Also verify that when adding a reserve with a barcode that does not yet exist in the course reserves that the warning 'The course already...' is not displayed and that the header of the div says Add 8) Finally verify that when adding a reserve with a barcode that DOES exist in the course reserves that the warning 'The course already...' IS displayed and the header of the div says Edit 9) Sign off! Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit c786e4de2369de34ce26610309cbce53534446d3 Author: Hayley Mapley Date: Thu Mar 14 03:47:59 2019 +0000 Bug 12441: Search.pl conditional checks and displays using same syspref Script search.pl checks OPACdefaultSortField and OPACdefaultSortOrder, but shows defaultSortField and defaultSortOrder when using Advanced Search in the staff client. Test plan: Apply the patch and then check that the Advanced Search uses defaultSortOrder and defaultSortField sysprefs instead of the OPAC sysprefs in the conditional. Check that sort behaviour in Advanced Search still functions as expected. (It should do - this doesn't change what displays, just improves consistency). Sponsored-by: Catalyst IT Signed-off-by: Michal Denar Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 29dd8d62943c303c60284e0430b1b7230891b97a Author: Nick Clemens Date: Sat Mar 23 09:43:47 2019 +0000 Bug 13782: Compiled CSS Signed-off-by: Nick Clemens commit fc188dfc825eb81fb6969305e8945b95138cbd41 Author: Owen Leonard Date: Fri Mar 22 18:16:33 2019 +0000 Bug 13782: RSS for news needs a bit of styling This patch makes a number of updates to the display of news in the OPAC. I hope that this makes OPAC news nicer/easier to read. It includes style changes to make the RSS link look better too. To test, apply the patch and regenerate the OPAC CSS. You should have multiple active news items. View the OPAC news with varied values of NewsAuthorDisplay and OpacNewsLibrarySelect. Test the single news item view. Test with Quotes on and off, and with OpacMainUserBlock populated or not. Signed-off-by: Liz Rea Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 8629a11601371a0c20505c5b1f70a45745068e02 Author: Owen Leonard Date: Fri Mar 22 16:43:51 2019 +0000 Bug 22568: Replace RSS icon in the OPAC with Font Awesome This patch removes the RSS icon image (feed-icon-16x16.png) from the OPAC and replaces it with Font Awesome icons styled to match. To test, apply the patch and regenerate the OPAC CSS. View the following pages, confirming that the RSS icon looks correct: - OPAC home page (RSS news icon) - Search results page (Subscribe to search) - Recent comments - Search history - Lists -> View list Signed-off-by: Liz Rea Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 54cf1df239e3b83ae5550e3ef499038dd5597d95 Author: Owen Leonard Date: Thu Mar 7 16:04:25 2019 +0000 Bug 22475: Shelving location doesn't appear on tags list view This patch corrects the tags list view so that shelving location appears correctly. Previously the template tried to display a variable which was empty. To test, apply the patch and locate an title which has both a tag applied to it and a shelving location defined for one or more items. Go to Tools -> Tags and click the tag to view titles with that tag. In the location column of the table the shelving location should appear along with library and call number. Signed-off-by: Liz Rea Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 0e0a3173859d4374087e99e1a7cd929c8da61c76 Author: Bj?rn Nyl?n Date: Thu Mar 28 10:28:29 2019 +0100 Bug 10345: Increment copy number when adding multiple copies. To test: 1. Add multiple copies of an item with data in the 'Copy number' field. Note that tha data will be identical for all items. 2. Apply patch. 3. Add multiple copies of an item with a positive integer (ie. only digits) in the 'Copy number' field. Note that the copy number is incremented for each item. 4. Add multiple copies of an item with some other type of data in the 'Copy number' field. Note that the copy number field remains unchanged for the added items. Signed-off-by: Pierre-Marc Thibault Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 05e49e6be98723f67ec85a5843fad1fc9787925f Author: Fridolin Somers Date: Tue Apr 2 09:57:35 2019 +0200 Bug 22620: OPAC description for CCODE in opac-reserve.tt Bug 20450 added CCODE to opac-reserve.tt using AuthorisedValues TT plugin. This patch changes the plugin call so that it requests OPAC description. Test plan : 1) Define a CCODE with staff and OPAC descriptions 2) Apply this collection on an item 3) At OPAC, place an hold on this item 4) Verify the collection display correctly OPAC description and not staff description Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 40503c8fa86e6c4480ec8ca59e28f0c6f394502d Author: Owen Leonard Date: Tue Mar 26 14:11:28 2019 +0000 Bug 22575: Item type administration uses invalid error class for dialog This patch modifies the item types administration script so that it passes a valid message type to the template, where the type is used as a CSS class. "Error" is a nonexistent dialog class. It should be "alert." To test, apply the patch and go to Administration -> Item types. - Try to delete an item type which is in use. The style of the error dialog should be correct. - Try to add an item type using a code which already exists. The error should look correct. Signed-off-by: Pierre-Marc Thibault Signed-off-by: Bin Wen Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit b1c70a3c7e667137e54c88a2e02b5ca5ad5ee10b Author: Owen Leonard Date: Thu Feb 28 13:12:59 2019 +0000 Bug 22432: Star ratings plugin replacement missing from a couple pages This patch modifies two templates to conform to the change to the start ratings plugin: Overdrive search results and RecordedBooks search results. On the Overdrive page, the star ratings are now correctly displayed using the new plugin. On the RecordedBooks page, star ratings code has been removed because it is unused. RecordedBooks doesn't provide ratings information in their API. To test you need credentials for both Overdrive and RecordedBooks. Apply the patch and enable both services. - In the OPAC, perform a search that will return results from Overdrive and RecordedBooks. - Open the search results for each of those services. - On the Overdrive search results page, star ratings should appear correctly (in read-only mode). - On the RecordedBooks page everything should look the same. Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit ced69febf3de17691d885e9ee7e03ef46c28b2ae Author: Nick Clemens Date: Sat Mar 23 08:51:15 2019 +0000 Bug 22607: DBRev 18.12.00.037 Signed-off-by: Nick Clemens commit cf95f0a7e6897d3dc4b90c92ffad19230379d7cb Author: Josef Moravec Date: Fri Mar 29 08:13:48 2019 +0000 Bug 22607: Change default value in issues.renewals to '0'. This patch change renewals column of issues and old_issues tables. Now it is NOT NULL default 0. It does not make sense when number of renewals is undefined, it is always integer with value zero or more Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit a5fcd93f72687e946d9bfbdc2541ed4a18704125 Author: Nick Clemens Date: Tue Apr 2 00:34:43 2019 +0000 Bug 22619: Fix null empty behaviour for new rules To test: 1 - Go to Admin->Circulation and fines rules 2 - Set All/All rules ot have a limit for Current checkouts allowed (and onsite checkouts allowed) 3 - Select an itemtype to add a new rule 4 - Save without entering any values 5 - Note that new rule displays with the same numebr as the all/all rule 6 - Check the DB, not no lines were added to circulation_rules table 7 - Delete the rule from the staff client 8 - Apply patch 9 - Repeat, note the new rule is unlimited 10 - Run selenium tests 11 - They pass! 12 - Check no rules/itemtypes are added to your system by the tests Signed-off-by: Liz Rea Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit f6bc67e851722451a970d085f51fb11fb03e21b3 Author: Colin Campbell Date: Mon Apr 1 12:16:51 2019 +0100 Bug 22611: Correction for call to get create_item in EDI.pm There was a typo in the addition of a call to effective_create_items causing processing to abort after adding a single copy. This patch reverts to using the C4::Context call as used for the first copy created, the intended call to effective_create_items is a wrapper around that as the field in the basket is guaranteed to be null (its not set when we call AddBasket). Being consistent and explicit in what we call should guard against future changes in dependencies exposing the logic flaw Added some comments to make logical flow of code clearer Signed-off-by: Liz Rea Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- Koha/EDI.pm | 6 +- admin/itemtypes.pl | 10 +- admin/smart-rules.pl | 5 +- catalogue/search.pl | 4 +- cataloguing/additem.pl | 8 ++ course_reserves/add_items.pl | 2 + installer/data/mysql/kohastructure.sql | 4 +- installer/data/mysql/updatedatabase.pl | 14 +++ .../en/modules/course_reserves/add_items-step2.tt | 12 ++- .../en/modules/course_reserves/course-details.tt | 2 +- .../intranet-tmpl/prog/en/modules/tags/list.tt | 5 +- koha-tmpl/opac-tmpl/bootstrap/css/opac.css | 2 +- koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss | 55 +++++++++-- .../opac-tmpl/bootstrap/en/modules/opac-main.tt | 102 ++++++++++++-------- .../bootstrap/en/modules/opac-overdrive-search.tt | 22 +++-- .../en/modules/opac-recordedbooks-search.tt | 10 +- .../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 9 +- .../bootstrap/en/modules/opac-search-history.tt | 16 ++- .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 2 +- .../bootstrap/en/modules/opac-showreviews.tt | 2 +- .../opac-tmpl/bootstrap/images/feed-icon-16x16.png | Bin 764 -> 0 bytes t/db_dependent/selenium/administration_tasks.t | 18 +++- 24 files changed, 217 insertions(+), 97 deletions(-) delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/images/feed-icon-16x16.png hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Apr 8 11:14:27 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 08 Apr 2019 09:14:27 +0000 Subject: [koha-commits] main Koha release repository branch 18.11.x updated. v18.11.04-36-g170cdc4 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, 18.11.x has been updated via 170cdc4b01ce53a4ac114ab4d2d45b14af50627f (commit) from 1c31c10539d2393ab640e103fe8829e6422e4717 (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 170cdc4b01ce53a4ac114ab4d2d45b14af50627f Author: Katrin Fischer Date: Sat Apr 6 10:19:14 2019 +0000 Bug 22648: Fix typo in SQL in smart-rules.pl Fixes 2 SQL statements for setting the maximum number of checkouts possible. To test: - In 18.11 - Verify that setting Default checkout, hold and return policy works - Verfiy that setting Default checkout, ohld and return policy by patron category works Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: admin/smart-rules.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 10 22:29:30 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 10 Apr 2019 20:29:30 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-1050-g35921d3 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 35921d30a99f3f4c4cdb21438c8516444a10f24c (commit) via ea7245631ebfb16d4921a6cf7b4b46799a241ff9 (commit) via e90cb16d79f611caa3cd6d6cbbca4ea01d7a8077 (commit) via 5b11c25fe76415078d1b48956512c29c0b2030b1 (commit) via 383ec1f51b4c505ac23471f8b5ee1622dc862787 (commit) via 192e3baa75f16891582244595fe305292b886dda (commit) via d6122ff78d4344441ed45ceb26ed09af83a15d15 (commit) via ec78d0cddbb5cf5455a2c67130062917a0a23484 (commit) via ea3cbef473a8b542b58341ef38beb9f7be20f4a1 (commit) via 247d0d1df1ee5cc7f3184d8ac6ab35373af739b3 (commit) via 313df03ed06f8c4229b38d0306c380214d895c4e (commit) via fa53eb4cfa1d0c2125fc3097e6d2328899fc4259 (commit) via d7a5925aa0a7a185c8671d8c9989d80bdf2c0939 (commit) via e98dacf9f1f8464f0db394da6bc1152f96713597 (commit) via 0b931d5de3c4fe9fa2b4823d9b8727b28a46aa7c (commit) via bdb157645538667cd23f8563ee6700e697a4adc8 (commit) via 6d4eb48dd47599dfd9738e1ae125abfa9f1109ee (commit) via 34b1713d86602cbfb9d7c6f68dccf7b293d18dce (commit) via a55e50cf62438ce356e8373ee1d03686d3f96e04 (commit) via b1171d9ef399d68e49044fbc2cb17efbeeaee093 (commit) via d2e189ca1c4f11d12435008053336563af2dd911 (commit) via 125de75517b64a95b93dead4b1fa5c2326f007eb (commit) via c5bc2563a856981eab29637fb2da0f6f014c0d6b (commit) via 9ec4d86636ffd4a11863cafe8d4eddb6e55c13db (commit) via b763b4698b31c8d32f482f13b50e89b58f68c443 (commit) from 41e0ff7cd6240c2c9ba2d1bec816b191ef091eb1 (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 35921d30a99f3f4c4cdb21438c8516444a10f24c Author: Magnus Enger Date: Fri Apr 5 10:03:58 2019 +0200 Bug 22646: Fix use of PrivacyPolicyURL To test: PatronSelfRegistration = Allow PatronSelfRegistrationDefaultCategory = PT (or some other real category) GDPR_Policy = Enforced PrivacyPolicyURL = Some URL - Go to /cgi-bin/koha/opac-memberentry.pl and verify that the text "privacy policy" displays a link to the current page, not the URL in PrivacyPolicyURL - Go to Administration > System preferences > Patrons > Privacy - Verify that the descriptions of GDPR_Policy and PrivacyPolicyURL does not mention that PrivacyPolicyURL needs to be set if GDPR_Policy is set. - Apply the patch - Verify that opac-memberentry.pl now links to the URL in PrivacyPolicyURL - Verify that the syspref descriptions mention the relationship between them Signed-off-by: Liz Rea Signed-off-by: Bin Wen Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit ea7245631ebfb16d4921a6cf7b4b46799a241ff9 Author: Owen Leonard Date: Thu Mar 14 13:15:01 2019 +0000 Bug 21013: Missing itemtype for checkut makes patron summary print explode This patch moves retrieval of the item type description from the script to the template using the ItemTypes template plugin. To test, apply the patch and locate an item which is checked out to someone. Modify the database record for that item to remove the item type (items.itype). View the print summary for the patron who has that item checked out. The page should display correctly. Checked-out items which have an item type should show that item type description correctly. Signed-off-by: Liz Rea Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit e90cb16d79f611caa3cd6d6cbbca4ea01d7a8077 Author: Ere Maijala Date: Fri Mar 8 13:27:26 2019 +0200 Bug 22295: Make Elasticsearch query builder group multi-term queries Test plan: 1. Do an advanced search for Title = new AND Title = york 2. Verify that the results match an advanced search for: Title = new york 3. Verify that tests in t/db_dependent/Koha/SearchEngine/Elasticsearch still pass Signed-off-by: Michal Denar Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 5b11c25fe76415078d1b48956512c29c0b2030b1 Author: Tomas Cohen Arazi Date: Tue Apr 9 15:59:14 2019 -0300 Bug 22675: Fix SCO behaviour on non-existent barcodes Bug 21206 replaced GetItem for Koha::Items->find, and introduced this problem. This patch verifies $item is defined before attempting to use its methods. To test: - Log into SCO - Type an invalid barcode => FAIL: Things explode :-/ - Apply this patch, reload - Type an invalid barcode => SUCCESS: A nice error message is displayed :-D - Sign off :-D Signed-off-by: Liz Rea Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 383ec1f51b4c505ac23471f8b5ee1622dc862787 Author: Owen Leonard Date: Tue Apr 9 13:21:08 2019 +0000 Bug 22553: Unchecking a subpermission does not uncheck the top level permission This patch makes a minor change to the set permissions page's JavaScript so that unchecking a subpermission will uncheck the top level permission. To test, apply the patch and open the "Set permissions" page for a patron. - Expand a permission with multiple subpermissions. - Check the top level permission. All subpermissions should be checked. - Uncheck one of the subpermissions. The top level permission should now be unchecked. Signed-off-by: Liz Rea Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 192e3baa75f16891582244595fe305292b886dda Author: Nick Clemens Date: Sat Mar 23 11:44:53 2019 +0000 Bug 22288: Correct item search in batchMod by barcode file To test: 1 - Have a list of barcodes that exist in your catalog 2 - Go to Tools->Batch item modification 3 - Attempt to modify items using the list 4 - Get an error page 5 - Apply patch 6 - Repeat 7 - Modification should work correctly Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit d6122ff78d4344441ed45ceb26ed09af83a15d15 Author: Jonathan Druart Date: Mon Mar 4 16:07:22 2019 -0300 Bug 22390: Never copy items if original order has been created from a subscription Signed-off-by: Martin Renvoize Signed-off-by: Katrin Fischer Tiny change to the code comment: serial => subscription order Signed-off-by: Nick Clemens commit ec78d0cddbb5cf5455a2c67130062917a0a23484 Author: Jonathan Druart Date: Thu Feb 21 14:48:24 2019 -0300 Bug 22390: (bug 15184 follow-up) Use aqorders.subscriptionid instead of biblio.serial It seems that we made a wrong assumption on bug 15184, see commit d658cb6f7ecb18845a78d4708ee63ad1126f220f Bug 15184: Do copy items for not a serial OR if items are created on ordering To know if an order has been created from a subscription we should check $order->subscriptionid instead of the $biblio->serial flag Signed-off-by: Martin Renvoize Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit ea3cbef473a8b542b58341ef38beb9f7be20f4a1 Author: Nick Clemens Date: Tue Apr 2 18:02:14 2019 +0000 Bug 22618: Move tests to t/db_dependent/Acquisition.t prove -v t/db_dependent/Acquisition.t Signed-off-by: Michal Denar Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit 247d0d1df1ee5cc7f3184d8ac6ab35373af739b3 Author: Nick Clemens Date: Sat Mar 23 08:13:13 2019 +0000 Bug 22641: Use raw filter on html slip To test: Enable SCO Load a patron Hit finish, print slip Note slip shows as raw html Apply patch Repeat, get a correctly formatted slip Signed-off-by: Liz Rea Signed-off-by: Tomas Cohen Arazi https://bugs.koha-community.org/show_bug.cgi?id=22068 Signed-off-by: Nick Clemens commit 313df03ed06f8c4229b38d0306c380214d895c4e Author: Nick Clemens Date: Mon Dec 24 15:59:22 2018 +0000 Bug 17978: Unit tests for changes Signed-off-by: Liz Rea Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit fa53eb4cfa1d0c2125fc3097e6d2328899fc4259 Author: Nick Clemens Date: Mon Dec 24 14:33:51 2018 +0000 Bug 17978: Check if hold can be placed before placing on placerequest.pl To test: 1 - Set an All/All/All rule with reserves limited 2 to 2 - Search in the staff side 3 - Select all records (or more than 2) from the results 4 - Click 'Place hold' 5 - Find a patron, place holds 6 - You get more holds than you should 7 - Delete those holds 8 - Apply patch 9 - Search and select more than 2 records 10 - Find patron, place holds 11 - Only 2 holds are placed Signed-off-by: Liz Rea Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit d7a5925aa0a7a185c8671d8c9989d80bdf2c0939 Author: Kyle M Hall Date: Tue Dec 19 14:20:56 2017 -0500 Bug 17978: Circ rules will not limit holds The crux of this issue is that all those holds are unfilled record level holds. The code that checks for the number of holds the user already has *always* uses a branchcode of some form. Because of this, any open record level holds are completely ignored for this purpose. Test Plan: 1) Set ReservesControlBranch to "item's home library" 2) Set an All libraries/All Patrons/All itemtypes rules limiting a patron to 2 holds 3) Place 3 record level holds, you can but you should not be able to! 4) Delete the holds 5) Apply this patch 6) Attempt to place 3 record level holds 7) Note that you cannot! Signed-off-by: Josef Moravec Signed-off-by: Marcel de Rooy Signed-off-by: Liz Rea Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit e98dacf9f1f8464f0db394da6bc1152f96713597 Author: Tomas Cohen Arazi Date: Fri Apr 5 15:13:36 2019 -0300 Bug 22068: (QA follow-up) Return meaningful error codes Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit 0b931d5de3c4fe9fa2b4823d9b8727b28a46aa7c Author: Jonathan Druart Date: Thu Feb 14 17:03:17 2019 -0300 Bug 22068: Prevent patrons to cancel article request they did not create opac-article-request-cancel.pl doesn't check that the article request to be cancelled actually belongs to the logged-in borrower. This results in any logged-in user being able to cancel any article request just by changing the id in the URL. Test plan: - Login with Patron P1, create an article request - Cancel it - Create another one - Copy the cancellation link (must be /cgi-bin/koha/opac-article-request-cancel.pl?id=X) - Login with Patron P2 - Hit the cancellation link => Without this patch the article request is cancelled => With this patch applied there is a 404 redirection Note that the 404 will also appears when the article request id does not exist. Signed-off-by: Ere Maijala Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit bdb157645538667cd23f8563ee6700e697a4adc8 Author: Nick Clemens Date: Wed Apr 10 19:57:10 2019 +0000 Bug 22600: Schema updates Signed-off-by: Nick Clemens commit 6d4eb48dd47599dfd9738e1ae125abfa9f1109ee Author: Nick Clemens Date: Wed Apr 10 19:55:14 2019 +0000 Bug 22600: DBRev 18.12.00.039 Signed-off-by: Nick Clemens commit 34b1713d86602cbfb9d7c6f68dccf7b293d18dce Author: Nick Clemens Date: Wed Apr 10 19:53:39 2019 +0000 Bug 22512: DBRev 18.12.00.038 Signed-off-by: Nick Clemens commit a55e50cf62438ce356e8373ee1d03686d3f96e04 Author: Tomas Cohen Arazi Date: Tue Apr 9 11:58:19 2019 -0300 Bug 22600: (QA follow-up) Raise an exception on missing interface param This patch makes add_credit and add_debit raise a Koha::Exceptions::MissingParameter exception if the 'interface' parameter is ommited. The database will fail to generate the line anyways in strict mode, and we better handle it gracefuly. Bonus: fixed the TODOs in the tests. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit b1171d9ef399d68e49044fbc2cb17efbeeaee093 Author: Martin Renvoize Date: Fri Mar 29 09:46:12 2019 +0000 Bug 22600: Update Tests adding 'interface' as needed Signed-off-by: Josef Moravec Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit d2e189ca1c4f11d12435008053336563af2dd911 Author: Martin Renvoize Date: Thu Mar 28 14:32:05 2019 +0000 Bug 22600: Set 'commandline' interface appropriately This patch change Koha::Cron to be a more generic Koha::Script class and update all commanline driven scripts to use it. Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit 125de75517b64a95b93dead4b1fa5c2326f007eb Author: Martin Renvoize Date: Mon Mar 25 19:04:58 2019 +0000 Bug 22600: Add 'cron' to interface types and set appropriately This patch adds 'cron' as a valid interface and sets it appropriately for existing cron scripts. Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit c5bc2563a856981eab29637fb2da0f6f014c0d6b Author: Martin Renvoize Date: Thu Mar 28 11:33:00 2019 +0000 Bug 22600: Add 'api' to interface types and set appropriately This patch adds 'api' as a valid interface and sets it appropriately for both the new REST api and previous /svc/ api's. Handling to keep the interface of a logged in session is included such that if the OPAC or Intranet use the API's internally via a Cookie we will maintain the interface throughout the session. Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit 9ec4d86636ffd4a11863cafe8d4eddb6e55c13db Author: Martin Renvoize Date: Thu Mar 28 10:00:22 2019 +0000 Bug 22600: Add 'interface' to accountlines This patch adds the 'interface' field to the accountlines table and updates all Koha::Object routines and calls to use it. Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit b763b4698b31c8d32f482f13b50e89b58f68c443 Author: Martin Renvoize Date: Thu Mar 14 12:14:17 2019 +0000 Bug 22512: Add status field to accountlines Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: C4/Accounts.pm | 3 + C4/Auth.pm | 6 + C4/Circulation.pm | 10 +- C4/Context.pm | 8 +- C4/Log.pm | 2 +- C4/Overdues.pm | 14 +- C4/Reserves.pm | 3 +- C4/SIP/ILS/Transaction/FeePayment.pm | 16 +- C4/SIP/SIPServer.pm | 4 + Koha.pm | 2 +- Koha/Account.pm | 36 +++- Koha/Account/Line.pm | 7 +- Koha/Acquisition/Order.pm | 2 +- Koha/Hold.pm | 9 +- Koha/Patron.pm | 7 +- Koha/REST/V1/Auth.pm | 2 + Koha/REST/V1/Patrons/Account.pm | 1 + Koha/Schema/Result/Accountline.pm | 20 +- Koha/Schema/Result/Issue.pm | 9 +- Koha/Schema/Result/OldIssue.pm | 9 +- Koha/Script.pm | 76 ++++++++ Koha/SearchEngine/Elasticsearch/QueryBuilder.pm | 1 + installer/data/mysql/kohastructure.sql | 2 + installer/data/mysql/updatedatabase.pl | 72 +++++++ .../prog/en/modules/admin/preferences/patrons.pref | 2 + .../prog/en/modules/members/member-flags.tt | 16 +- .../prog/en/modules/members/moremember-print.tt | 3 +- .../bootstrap/en/modules/opac-memberentry.tt | 2 +- .../bootstrap/en/modules/sco/printslip.tt | 6 +- members/mancredit.pl | 3 +- members/pay.pl | 2 + members/paycollect.pl | 3 + members/summary-print.pl | 3 - misc/admin/koha-preferences | 1 + misc/batchCompareMARCvsFrameworks.pl | 1 + misc/batchDeleteUnusedSubfields.pl | 1 + misc/batchImportMARCWithBiblionumbers.pl | 1 + misc/batchRebuildBiblioTables.pl | 1 + misc/batchRebuildItemsTables.pl | 1 + misc/batchRepairMissingBiblionumbers.pl | 2 +- misc/batchdeletebiblios.pl | 1 + misc/check_sysprefs.pl | 1 + misc/commit_file.pl | 1 + misc/cronjobs/advance_notices.pl | 2 +- .../cronjobs/automatic_item_modification_by_age.pl | 1 + misc/cronjobs/automatic_renewals.pl | 2 +- misc/cronjobs/batch_anonymise.pl | 1 + misc/cronjobs/build_browser_and_cloud.pl | 1 + misc/cronjobs/cart_to_shelf.pl | 1 + misc/cronjobs/check-url-quick.pl | 2 + misc/cronjobs/check-url.pl | 2 + misc/cronjobs/cleanup_database.pl | 1 + misc/cronjobs/cloud-kw.pl | 4 +- misc/cronjobs/create_koc_db.pl | 3 +- misc/cronjobs/delete_expired_opac_registrations.pl | 1 + misc/cronjobs/delete_items.pl | 2 + misc/cronjobs/delete_patrons.pl | 1 + misc/cronjobs/delete_records_via_leader.pl | 1 + misc/cronjobs/edi_cron.pl | 1 + misc/cronjobs/fines.pl | 1 + misc/cronjobs/gather_print_notices.pl | 1 + misc/cronjobs/holds/auto_unsuspend_holds.pl | 1 + misc/cronjobs/holds/build_holds_queue.pl | 1 + misc/cronjobs/holds/cancel_expired_holds.pl | 1 + misc/cronjobs/holds/cancel_unfilled_holds.pl | 1 + misc/cronjobs/import_webservice_batch.pl | 1 + misc/cronjobs/j2a.pl | 1 + misc/cronjobs/longoverdue.pl | 2 + misc/cronjobs/membership_expiry.pl | 1 + misc/cronjobs/merge_authorities.pl | 5 +- misc/cronjobs/notice_unprocessed_suggestions.pl | 1 + misc/cronjobs/overdue_notices.pl | 2 +- misc/cronjobs/process_message_queue.pl | 2 + misc/cronjobs/purge_suggestions.pl | 2 + misc/cronjobs/reconcile_balances.pl | 2 +- misc/cronjobs/remove_temporary_edifiles.pl | 1 + misc/cronjobs/rss/rss.pl | 2 + misc/cronjobs/runreport.pl | 1 + misc/cronjobs/serialsUpdate.pl | 1 + misc/cronjobs/share_usage_with_koha_community.pl | 1 + misc/cronjobs/sitemap.pl | 2 + .../cronjobs/social_data/get_report_social_data.pl | 2 + misc/cronjobs/social_data/update_social_data.pl | 2 + misc/cronjobs/staticfines.pl | 1 + misc/cronjobs/stockrotation.pl | 2 + .../thirdparty/TalkingTech_itiva_inbound.pl | 1 + .../thirdparty/TalkingTech_itiva_outbound.pl | 1 + misc/cronjobs/update_totalissues.pl | 2 + misc/devel/create_superlibrarian.pl | 1 + misc/devel/populate_db.pl | 1 + misc/export_borrowers.pl | 1 + misc/export_records.pl | 1 + misc/exportauth.pl | 1 + misc/import_patrons.pl | 1 + misc/link_bibs_to_authorities.pl | 1 + misc/maintenance/UNIMARC_fix_collectiontitle.pl | 1 + .../UNIMARC_sync_date_created_with_marc_biblio.pl | 1 + misc/maintenance/auth_show_hidden_data.pl | 1 + .../borrowers-force-messaging-defaults.pl | 1 + misc/maintenance/cmp_sysprefs.pl | 1 + misc/maintenance/fix_accountlines_date.pl | 1 + .../fix_accountlines_rmdupfines_bug8253.pl | 1 + misc/maintenance/fix_mysql_constraints.pl | 1 + misc/maintenance/fix_tags_weight.pl | 1 + .../maintenance/make_zebra_dom_cfg_from_record_abs | 1 + misc/maintenance/process_record_through_filter.pl | 2 + misc/maintenance/remove_items_from_biblioitems.pl | 1 + misc/maintenance/sanitize_records.pl | 2 + .../maintenance/search_for_data_inconsistencies.pl | 1 + misc/maintenance/touch_all_biblios.pl | 2 + misc/maintenance/touch_all_items.pl | 2 + misc/maintenance/update_authorities.pl | 1 + misc/migration_tools/buildCOUNTRY.pl | 1 + misc/migration_tools/buildEDITORS.pl | 1 + misc/migration_tools/buildLANG.pl | 1 + misc/migration_tools/build_oai_sets.pl | 1 + misc/migration_tools/bulkmarcimport.pl | 1 + misc/migration_tools/checkNonIndexedBiblios.pl | 1 + misc/migration_tools/create_analytical_rel.pl | 1 + misc/migration_tools/fix_onloan.pl | 4 +- misc/migration_tools/import_lexile.pl | 1 + misc/migration_tools/rebuild_zebra.pl | 1 + misc/migration_tools/remove_unused_authorities.pl | 1 + misc/migration_tools/switch_marc21_series_info.pl | 1 + misc/migration_tools/upgradeitems.pl | 4 +- misc/mod_zebraqueue.pl | 1 + misc/recreateIssueStatistics.pl | 2 + misc/search_tools/rebuild_elastic_search.pl | 1 + misc/stage_file.pl | 1 + offline_circ/process_koc.pl | 2 +- opac/opac-account-pay-paypal-return.pl | 3 +- opac/opac-article-request-cancel.pl | 13 +- opac/sco/sco-main.pl | 3 +- reserve/placerequest.pl | 14 +- t/Acquisition.t | 68 ------- t/Context.t | 3 +- .../rotatingCollections.pl => t/Koha/Script.t | 45 +++-- .../rotatingCollections.pl => t/Koha/Script_cron.t | 45 +++-- t/db_dependent/Accounts.t | 75 ++++---- t/db_dependent/Acquisition.t | 45 ++++- t/db_dependent/Circulation.t | 21 ++- .../Circulation/NoIssuesChargeGuarantees.t | 2 +- t/db_dependent/Holds.t | 18 +- t/db_dependent/Koha/Account.t | 196 ++++++++++++-------- t/db_dependent/Koha/Account/Lines.t | 64 ++++--- t/db_dependent/Koha/Acquisition/Order.t | 73 +++++++- .../Koha/SearchEngine/Elasticsearch/QueryBuilder.t | 32 +++- t/db_dependent/api/v1/patrons_accounts.t | 11 +- tools/batchMod.pl | 4 +- 149 files changed, 878 insertions(+), 353 deletions(-) create mode 100644 Koha/Script.pm delete mode 100644 t/Acquisition.t copy rotating_collections/rotatingCollections.pl => t/Koha/Script.t (51%) mode change 100755 => 100644 copy rotating_collections/rotatingCollections.pl => t/Koha/Script_cron.t (51%) mode change 100755 => 100644 hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 11 16:10:23 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 11 Apr 2019 14:10:23 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-1083-g08f02c1 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 08f02c1aa5a6ae1f1ee3b10a086831c1a2dbcb66 (commit) via ccc2b4b073113b2c0603437b5a84d4544ede16e4 (commit) via 968c888e1579ab28ec165819a011612d8b8f5570 (commit) via f7869ad48b8f2f86f2b912aad1c3dcbd1a5679c1 (commit) via a5f3d405f56202beb4426da52f3bf4019f26484b (commit) via 761b410f99cbbfff8e353c538fde2b6816408795 (commit) via 275dee5f9b9a26b3490bf3646c71c78a2d8647eb (commit) via 1493c42e7bae5bffab430072587b7aa0527f6fc7 (commit) via 7208ac6196a8619dbb0cca3b6f01480f4c46cab1 (commit) via 19b9aacfbae616f7198cd93ebdbd97115d204c5b (commit) via 9cbc5f2aa072ec41a70fd1fa1de4f684fcd695e9 (commit) via 3db5feb900d3e6a6400767c771afe78bab0fa880 (commit) via fbdb2b2be009140be6f9b5b84c765741bc828a3c (commit) via b215c7d55195a4912fb3ab585aba6ee44581f746 (commit) via 3323a428eaf662a0ba1a31b2cb56002a7372461a (commit) via 7acb5394e1f62728c90a1d18e988c23a3e2862d2 (commit) via edf173e6ef1fa6de6e07f41c229799733456901a (commit) via d498c2563d76c05a1e819d63d8b56f732c3a7768 (commit) via d8a196cc9decd19a5401907adc64c7dee80a0c55 (commit) via a1eba24391b4653f842a1767a48ac8b9f470b8ea (commit) via 9c0197a8d1b1a29f28de4b91e6605ae0a1088235 (commit) via 5768ea9532e0ee19b77346e2ba13681339b18017 (commit) via bc5e84eedc7132c64452e7f37e5a825f6d17c9bd (commit) via a00e1467b9754432196df838b6e000262b7251e7 (commit) via 7d550eb1b3b10f82c8463e85beb63184952fc4f1 (commit) via 30ab16657b10dbe8e5c42f1f3900a31c3506bb25 (commit) via 083f789b9548ec70d86dc48911df1bc9febda619 (commit) via bfeac6486516f185d9882d294d5000ab773c7dd5 (commit) via 3c2ce5df6f550fd2452b978e1b5f7ac54e66b092 (commit) via 3e9989568e171ebcfc73df80c49556e0b663a8ae (commit) via 679fdaebb1a611859a968f22b85c37fbc00b055b (commit) via 64740260e51b4249dbc99d151dadfb173cde5298 (commit) via d3059e6c94f324d6984368fa8b8e77ad1dfbcf71 (commit) from 35921d30a99f3f4c4cdb21438c8516444a10f24c (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 08f02c1aa5a6ae1f1ee3b10a086831c1a2dbcb66 Author: Hayley Mapley Date: Mon Apr 8 10:25:11 2019 +1200 Bug 19630: Removed constant message from Status column Test plan: Same as initial test plan, except that when a hold has no status that the Status column for that hold should be blank instead of saying "Hold has been placed". Sponsored-by: Catalyst IT Signed-off-by: Michal Denar Signed-off-by: Michal Denar Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit ccc2b4b073113b2c0603437b5a84d4544ede16e4 Author: Hayley Mapley Date: Thu Mar 14 21:37:36 2019 +0000 Bug 19630: Added Status column to Patron Holds table When a hold has been suspended or is waiting, the status message appears in the Barcode column of the Holds table. This patch fixes this by adding a separate Status column which details the status of the Hold, whether it has been suspended, or is in transit, etc. Test plan: 1) Place an item level hold and a 'Next Available' record level hold for a patron. 2) View the holds in Patrons->Patron details for that Patron in the Check out and Details tabs 3) Suspend one of the holds, and note that the status appears in the barcode column 4) Set a hold to be waiting for pickup, and note the status appears in the barcode column 5) Apply the patch 6) Check the same holds and note that the statuses now appear in the new column called Status, and note that if a hold has status effect that the row reads "Hold has been placed" 7) Verify that this is the case in both the Holds tables (in Check out tab and Details tab) Sponsored-by: Catalyst IT Signed-off-by: Jose-Mario Monteiro-Santos Signed-off-by: Michal Denar Signed-off-by: Michal Denar Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 968c888e1579ab28ec165819a011612d8b8f5570 Author: Hayley Mapley Date: Thu Mar 14 04:14:57 2019 +0000 Bug 19497: Removed title (tooltip) from Edit button in items_search_fields.tt This patch removes the tooltip that appears when hovering over the Edit button of Item Search Fields in the staff client. This was done for consistency reasons, including that this tooltip is not translated and tooltips do not appear to be on the majority of buttons in the staff client. Test plan: 1) In Home->Administration->Item search fields create a new search field if you haven't got any already 2) Observe the tooltip that appears when hovering over the Edit button in the Item serach fields table. 3) Apply the patch and observe that the tool tip no longer appears. Sponsored-by: Catalyst IT Signed-off-by: Michal Denar Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit f7869ad48b8f2f86f2b912aad1c3dcbd1a5679c1 Author: Nick Clemens Date: Thu Apr 11 13:39:10 2019 +0000 Bug 19670: DBRev 18.12.00.041 Signed-off-by: Nick Clemens commit a5f3d405f56202beb4426da52f3bf4019f26484b Author: Ere Maijala Date: Thu Mar 14 14:33:18 2019 +0200 Bug 19670: Change Collation of marc_field to allow mixed case mappings Test plan: 1. Apply patch and update database 2. Verify that you can add a search field mapping for both 100a and 100A. 3. Verify that the above also works with a newly-created database. Signed-off-by: Michal Denar Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 761b410f99cbbfff8e353c538fde2b6816408795 Author: Owen Leonard Date: Wed Mar 6 19:02:50 2019 +0000 Bug 22444: currencies_manage permission doesn't provide link to manage currencies when selected alone This patch modifies the acquisitions sidebar menu so that it checks properly for the currencies_manage permission. This patch also removes the menu link directly to the administration home page. Since we're removing the check on the general "CAN_user_parameters" permission it doesn't make sense to assume the page is accessible. To test, apply the patch and modifiy a staff user so that they have no "parameters" permissions but do have "currencies_manage" permission. Go to the Acquisitions home page. There should be a link to currencies management in the sidebar menu. Perform the same test with a user who has "parameters" permissions but not "currencies_manage" permission. There should be no link to currencies in the acquisitions sidebar menu. The user should have access to the administrative home page. Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 275dee5f9b9a26b3490bf3646c71c78a2d8647eb Author: Maryse Simard Date: Thu Feb 7 08:24:03 2019 -0500 Bug 21263: Pickup library not set correctly when using Default holds policy In the case of a specific item hold, it can only be fulfilled if the pickup library matches the hold fulfillment policy. Therefore, if OPACAllowUserToChooseBranch is set to don't allow, the pickup library should correspond to the policy. In case of hold that does not specify an item, the homebranch or holdingbranch can't be determined at this time, so the pickup library still defaults to the homebranch of the borrower. Same if there is no policy or it states 'any'. To test: - Make sure OPACAllowUserToChooseBranch is set to don't allow - Make sure you have two branches A and B - Have one item whose homebranch is B - Have one user whose homebranch is A - Make sure the circulation rules allow the user to reserve the item's item type 1. Go to Administration > Circulation and fines rules 2. Create a Default holds policy by item type for that item type - Item type = item's item type - Hold policy = From any library - Hold pickup library match = item's home library - Return policy = item returns home 3. Go to the OPAC and log in with the user's credentials 4. Search for the item 5. Click on "Place hold" 6. Select a specific item and confirm hold 7. In the user's file on the OPAC and check the reservation's pickup library. It should be the item's homebranch You can then repeat the steps for 'item's holding library' or 'any library' as the Hold pickup library match. It should also work the same way if there is no 'Default holds policy by item type' for this item type but a 'Default checkout, hold and return policy' set. Finally, check that placing a hold without selecting a specific item still defaults the pickup library to the borrower's homebranch. Signed-off-by: Hayley Mapley Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 1493c42e7bae5bffab430072587b7aa0527f6fc7 Author: Andrew Isherwood Date: Fri Apr 5 14:45:39 2019 +0100 Bug 22121: Display 'Price paid' on ILL requests according to CurrencyFormat pref To test: - Install BLDSS backend see: https://wiki.koha-community.org/wiki/ILL_backends - Add a new BLDSS ILL request - Edit ILL request - Fill in Price paid field - Verify Price paid is formatted correctly on 'Manage ILL request' page Signed-off-by: Ethan Amohia Signed-off-by: Martin Renvoize https://bugs.koha-community.org/show_bug.cgi?id=22121 Signed-off-by: Nick Clemens commit 7208ac6196a8619dbb0cca3b6f01480f4c46cab1 Author: Jonathan Druart Date: Thu Mar 7 09:14:25 2019 -0300 Bug 22472: Make column_exists early return if the table does not exist On the way we move TableExists to C4::Installer, where it belongs to. Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 19b9aacfbae616f7198cd93ebdbd97115d204c5b Author: Jonathan Druart Date: Thu Mar 7 09:14:06 2019 -0300 Bug 22472: Add tests Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 9cbc5f2aa072ec41a70fd1fa1de4f684fcd695e9 Author: Katrin Fischer Date: Thu Apr 4 00:56:43 2019 +0000 Bug 21659: Change link to basket group edit page I have taken another look at other links like the one from acq order search and changed the link to not lead to the vendor's basket group page but to the edit page of the invidividual basket group. To test: - Same as first patch, verify links now lead to the basket grou edit page https://bugs.koha-community.org/show_bug.cgi?id=21650 Signed-off-by: Jose-Mario Monteiro-Santos Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 3db5feb900d3e6a6400767c771afe78bab0fa880 Author: Katrin Fischer Date: Mon Mar 11 16:24:16 2019 +0000 Bug 21659: Fix links to basket groups from order receive page Fixes a problem with the template variables on the order receive page, so that the links to basket groups work correctly again. To test: - Create some orders with and without basket groups - Receive shipment - Verify that the basket group links for pending orders work right - Receive an order line - Verify that the basket group links for received orders work right Signed-off-by: Jose-Mario Monteiro-Santos Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit fbdb2b2be009140be6f9b5b84c765741bc828a3c Author: Katrin Fischer Date: Wed Apr 3 22:35:38 2019 +0200 Bug 22634: Standardize table creation for stockrotation* tables in kohastructure.sql The existing pattern is: DROP TABLE IF EXISTS ... CRATE TABLE Stockrotation was using: CREATE TABLE IF NOT EXISTS ... which would not recreate the table in a database it's already existing in possibly causing mismatches in table structure. To test: - Drop your database - Run through the web installer - Make sure there are no Database/SQL errors - Makse sure the 4 stockrotation tables have been created Signed-off-by: Fr?d?ric Demians Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit b215c7d55195a4912fb3ab585aba6ee44581f746 Author: Katrin Fischer Date: Wed Apr 3 19:28:38 2019 +0000 Bug 22631: Make links on barcode on hold summary page consistent (bug 21070) Bug 21070 changed the link on the holds summary so the barcode would link to the item on moredetail for an item level hold. If a hold is already waiting, the link still goes to the detail page of the record. This patch changes it so the barcode always links to the item. To test: - Place some item level holds on a record - Verify the barcodes on the hold summary page link to moredetail.pl - Return one of the items so that the hold is waiting - Verify the barcode links to the record detail page now - Apply patch - Verify barcodes for pending and waiting holds now both link to moredetail.pl Signed-off-by: Owen Leonard Signed-off-by: Bin Wen Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 3323a428eaf662a0ba1a31b2cb56002a7372461a Author: Katrin Fischer Date: Mon Apr 1 19:15:18 2019 +0000 Bug 22624: Show OPAC description for authorised values in OPAC Patch adds the IS_OPAC parameter to a few GetByCode calls in OPAC files. To test: - Add different OPAC and intranet descriptions to some authorised value categories: - TERM - DEPARTMENT - LOC - CCODE - Create a new course using the values and adding items to it - Check the course reserves overview and detail pages in OPAC - Verify Department, term, location, and collection show the OPAC description if existing - Create a subscription, make sure a default location is selected - Check the OPAC detail page, subscription tab for this subsription in the OPAC - Verify the location of the subscription displays correctly Signed-off-by: Mika?l Olangcay Brisebois Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 7acb5394e1f62728c90a1d18e988c23a3e2862d2 Author: Owen Leonard Date: Thu Apr 4 18:27:28 2019 +0000 Bug 13629: SingleBranchMode removes both library and availability search from advanced search This patch modifies the OPAC advanced search form so that it is possible to limit searches to available items even if there is only one library. To test, apply the patch and go to the advanced search page in the OPAC. - With only one library configured: There should be a section labeled "Availability" with just the "only available" checkbox. - With multiple libraries: The section should be labeled "Location and availability" and should have the library dropdown and the availability checkbox. Signed-off-by: Pierre-Marc Thibault Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit edf173e6ef1fa6de6e07f41c229799733456901a Author: Owen Leonard Date: Thu Apr 4 14:05:21 2019 +0000 Bug 14358: Changing the module refreshes the page and resets library choice This patch makes an incremental change towards fixing Bug 14358: The "New notice" button is converted to a dropdown button which asks the user to select a module to start with. To test, apply the patch and go to Tools -> Notices. Test the "New notice" button and confirm that module selections are reflected in the notice add form you are shown. Signed-off-by: Mika?l Olangcay Brisebois Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit d498c2563d76c05a1e819d63d8b56f732c3a7768 Author: Nick Clemens Date: Thu Apr 11 12:30:50 2019 +0000 Bug 22680: Compiled CSS Signed-off-by: Nick Clemens commit d8a196cc9decd19a5401907adc64c7dee80a0c55 Author: Owen Leonard Date: Wed Apr 10 17:55:22 2019 +0000 Bug 22680: OPAC language footer not positioned correctly This patch modifies the OPAC CSS so that the language-selection footer is positioned correctly. To test, apply the patch and rebuild the OPAC CSS. - Enable one or more translations in the OPAC - View a page in the OPAC which can display in your browser without a vertical scrollbar (for instance, the OPAC main page with no news items or OpacMainUserBlock). - The language-selection footer should appear at the bottom of the screen. At smaller browser heights the footer should scroll offscreen. - Test with content in the opaccredits system preference, and with OpacKohaUrl enabled. The footer should still be positioned correctly. Signed-off-by: Liz Rea Signed-off-by: Nick Clemens commit a1eba24391b4653f842a1767a48ac8b9f470b8ea Author: Nick Clemens Date: Thu Apr 11 12:26:21 2019 +0000 Bug 22626: (RM follow-up) Adjust column after 12166 Signed-off-by: Nick Clemens commit 9c0197a8d1b1a29f28de4b91e6605ae0a1088235 Author: Owen Leonard Date: Tue Apr 9 16:06:27 2019 +0000 Bug 22626: 'Filter paid transactions' broken on Transactions tab in staff This patch changes a parameter in the function which filters the DataTable of transactions. The addition of more columns to the table changed the index of the column which is being filtered. To test, apply the patch and locate a patron who has multiple fines or charges, some of them paid. Go to Accounting -> Transactions. Test the "Filter paid transactions" link. Table rows which show "0.00" in the "Oustanding" column should be hidden. Signed-off-by: Liz Rea Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 5768ea9532e0ee19b77346e2ba13681339b18017 Author: Nick Clemens Date: Thu Apr 11 12:21:01 2019 +0000 Bug 12166: DBRev 18.12.00.040 Signed-off-by: Nick Clemens commit bc5e84eedc7132c64452e7f37e5a825f6d17c9bd Author: Martin Renvoize Date: Tue Apr 9 09:19:16 2019 +0100 Bug 12166: (QA follow-up) Update test for description Update the relevant test to check for 'description eq title' as aposed to the old 'description eq "Reserve Charge - title"'. Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit a00e1467b9754432196df838b6e000262b7251e7 Author: Katrin Fischer Date: Sat Apr 6 13:16:56 2019 +0000 Bug 12166: (follow-up) Fix sequence of columns in OPAC Type and description column headings were switched. To test: - Check the table headings of the fines table in the OPAC fines table match the content Signed-off-by: Owen Leonard Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 7d550eb1b3b10f82c8463e85beb63184952fc4f1 Author: Katrin Fischer Date: Sat Apr 6 12:11:38 2019 +0000 Bug 12166: (follow-up) Remove 'Reserve Charge' from descriptions in accountlines With the prior 'Hold fee' will be displayed in OPAC and staff, so the 'Reserve Charge' would just be an untranslatable double up of information. To test: - Make sure you create some Reserve Charges prior to applying this patch set - Verify they show in staff and OPAC account - Apply patch - Run database update - Verfy the "Rental Charge - " is gone and old and new entries match now Signed-off-by: Owen Leonard Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 30ab16657b10dbe8e5c42f1f3900a31c3506bb25 Author: Owen Leonard Date: Thu Apr 4 15:44:30 2019 +0000 Bug 12166: Improve display of Reserve charges in patron account This patch makes changes to the way hold fees are recorded and displayed in the OPAC and staff client: - No English strings should be stored in the accountline description. - The accounttype code should be used to display what kind of charge it is. To test, apply the patch and go to the staff client: - Configure a patron category to have a hold fee. - Place one or more holds for a patron in that category. - On the patron's record, view Accounting -> Make a payment - There should be a separate column for "Account type" showing "Hold fee" for the hold charges. - There should be no "Res" or "Reserve Charge" text in the description column--just the title. - Switch to the "Transactions" tab. The display should be similar. - In the OPAC, log in as a patron who has hold fees on their account. - View the "your fines" page to confirm that the information is displayed correctly there as well. - Place a hold for a patron who incurs hold charges. - Log in to the self-checkout module as that patron and check out an item which will fulfill that hold. - The correct fine information should be saved to accountlines: A "Res" type with a description consisting only of the title. Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 083f789b9548ec70d86dc48911df1bc9febda619 Author: Nick Clemens Date: Wed Feb 27 12:45:47 2019 -0500 Bug 20937: Truncate items for print notices when user has an email To test: 1 - Set PrintNoticesMaxLines to 1 2 - Checkout 2 (or more) items to a patron and make them overdue to trigger a notice 3 - Make sure the patron has an email 4 - Make sure the notice you are sending is set to 'print' as the type 5 - Run overdue_notices.pl without the 'nomail' option 6 - Find the message and note all items have been added 7 - Apply patch 8 - Clear the message queue 9 - Re-run overdue_notices.pl 10 - Confirm the message now has only 1 item. 11 - Set PrintNoticesMaxLines to 0 12 - Clear the message queue 13 - Re-run overdue_notices.pl 14 - Confirm the message has 2 items as expected Signed-off-by: Martin Renvoize Signed-off-by: Katrin Fischer Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit bfeac6486516f185d9882d294d5000ab773c7dd5 Author: Katrin Fischer Date: Sun Apr 7 16:25:28 2019 +0000 Bug 22075: Fix encoding problem with RIS export in OPAC When exporting a record with diacritics in RIS format from the detail page in OPAC the encoding is not correct and the diacritics appear broken. This patch fixes it. To test: - Find or create a record with some special chars in your OPAC - Go to the detail page - Save as > RIS - Verify the diacritics are broken in an editor - Apply patch - Repeat and verify everything now displays correctly Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 3c2ce5df6f550fd2452b978e1b5f7ac54e66b092 Author: Nick Clemens Date: Mon Mar 25 12:55:03 2019 +0000 Bug 22541: Invoice adjustments should show invoice number and include link on ordered.pl and spent.pl To test: 1 - Find a vendor in acquisitions 2 - Click 'receive shipment' 3 - Create an invoice 4 - Click 'Finish receiving' 5 - Add an adjustment that encumbers while open and update adjustments 6 - Go to acqui-home and click on the ordered total for the fund with the adjustment 7 - Note the invoice adjustment shows the invoice id and does not link 8 - Add another invoice and another adjustment, but close the invoice this time 9 - Go to acqui-home and click on the spent total for the fund with the adjustment 10 - Note the invoice adjustment shows the invoice id and does not link 11 - Apply patch 12 - Visit the spent and ordered pages and note the adjustments show invoicenumber and are links 13 - prove -v t/db_dependent/Koha/Acquisition/Invoice/Adjustments.t Signed-off-by: Liz Rea Signed-off-by: Liz Rea Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 3e9989568e171ebcfc73df80c49556e0b663a8ae Author: Fridolin Somers Date: Wed Mar 27 16:19:29 2019 +0100 Bug 22595: Items search is mixing inputs Items search is using inputs and selects from search form to create an Ajax call. In this call selects are parsed before inputs. But a custom search field can be used with authorised values and used after a regular search field. In this case the "q" param is not ordered like the "name" param. Test plan : 1) Go to Administration > Item search fields 2) Define a search field with an authorised values category 3) Go to items search 4) Use a regular filter like call number 5) Click on new field 6) Use custom field with an authorised value 7) Perform search => Without patch you get wrong resuts, authorised value is used as value for first field => You can see this by listening traffic in Firebug, look at params "f" and "q" 8) Check some combinaison of select and input filters Signed-off-by: Michal Denar Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 679fdaebb1a611859a968f22b85c37fbc00b055b Author: Owen Leonard Date: Thu Jan 31 14:29:45 2019 +0000 Bug 22250: Clean up Mana KB integration with serials and reports This patch makes many changes to templates and JavaScript related to the integration of Mana with serials reports: - Many incorrect uses of the raw filter with html - Corrections to Bootstrap modal markup - Untranslatable strings moved out of JavaScript - Removed markup and JavaScript related to reports comments, a feature which doesn't exist in this version. New include file: mana/mana-comment-status.inc This file contains hidden-by-default messages which are shown during the process of submitting a comment on a subscription. New include file: mana/mana-share-report.inc This file contains the "Share report" modal markup formerly in guided_reports_start.tt New JavaScript file: mana.js Previously mana.inc, an include file containing only JavaScript which didn't include any template processing. Changed: mana/mana-report-search-result.inc This include file is now a full template so that jQuery's load() function can be used to pull its contents into the reports search modal. Changed: svc/mana/search This script was returning json-encoded HTML. Now it returns regular HTML. To test you must have Mana configured and enabled. Apply the patch and go to Reports -> Saved reports. - Choose New report -> New SQL from Mana. A "Mana search" modal should appear. - Perform a search which will return results, e.g. "circulation." - A "Loading" indicator should appear while the results are being retrieved. It should disappear when results appear. - Results should appear in the DataTable with sorting, paging, and search options. - In the "Notes" column, notes longer than 200 characters should be truncated with a "Show more" link. Clicking it should expand the comment and reveal a "Show less" link in its place. - Click the "Import" button (previously "Use"). The button icon should change to a loading indicator. - When the import is complete you should be redirected to a view of your new report. Go to Serials and click the "Search on Mana" link in the sidebar. - Perform a search for a serial - Results should appear in a DataTable with sorting, paging, and search options. - Sorting by title should ignore articles "a," "an," and "the." Create a new subscription or edit an existing subscription which will match a record in Mana. - On the second step of adding/editing the subscription a message should appear at the top of the form, "Searching for subscription in Mana Knowledge Base," with a loading icon. - When searching has completed a "Show Mana results" link should appear. - Clicking the link should trigger a modal showing search results which match your subscription, displayed in a DataTable with sorting, paging, and search options. - The last column of the table should contain "Import" and "Report" buttons. - Clicking the "Report" button should trigger a menu. Any existing comments will be listed as well as a "New comment" item. - Clicking an existing comment should cause the menu to close and a "Submitting comment" message to appear. It should be shortly replaced with a "Your comment has been submitted" message. - Clicking "New comment" should reveal a comment form. - It should not be possible to submit an empty comment. - Clicking the "cancel" link should redisplay the search results. - Submitting a new comment should trigger a "Submitting comment" message followed by a "Your comment has been submitted" message. - In the table of search results, click the "Import" button (previously "Use"). The button icon should change to a loading indicator. - The modal should close and the data from Mana should be loaded into the subscription entry form. View the detail page of a subscription which has saved with Mana data. - There should be a "Report mistake" button in the toolbar. Clicking it should reveal a menu of comments like the one you saw previously. - Clicking an existing comment should cause the menu to close and a "Submitting comment" message to appear. It should be shortly replaced with a "Your comment has been submitted" message. - Clicking "New comment" should reveal a comment form modal. - It should not be possible to submit an empty comment. - Clicking the "cancel" link should hide the modal. - Submitting a new comment should trigger a "Submitting comment" message followed by a "Your comment has been submitted" message. Signed-off-by: Michal Denar Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 64740260e51b4249dbc99d151dadfb173cde5298 Author: Katrin Fischer Date: Tue Mar 12 11:11:45 2019 +0000 Bug 19747: Add link to article requests help page Newer manuals contain information about article requests. This patch adds the link to the article request section in the manual. To test: - Activate ArticleRequests system preference - Go to Circulation > Article requests - Click on Help - Verify that you end up in the proper section of the manual Signed-off-by: Michal Denar Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit d3059e6c94f324d6984368fa8b8e77ad1dfbcf71 Author: Martin Renvoize Date: Wed Apr 3 15:59:20 2019 +0100 Bug 20912: (QA follow-up) Fix for missed signature failure We missed a change in calling parameters passed to CalcDateDue in AddRenewal during the initial QAing. This patch corrects the call and adds a test to catch regressions. Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Dobrica Pavlinusic Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 1 - C4/Circulation.pm | 2 +- C4/Installer.pm | 16 +- C4/Reserves.pm | 2 +- Koha.pm | 2 +- Koha/Acquisition/Invoice/Adjustment.pm | 15 ++ Koha/Manual.pm | 1 + acqui/ordered.pl | 2 +- acqui/spent.pl | 2 +- installer/data/mysql/kohastructure.sql | 11 +- installer/data/mysql/updatedatabase.pl | 36 +-- .../intranet-tmpl/prog/en/includes/accounts.inc | 1 + .../prog/en/includes/acquisitions-menu.inc | 3 +- .../intranet-tmpl/prog/en/includes/holds_table.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/includes/mana.inc | 44 ---- .../prog/en/includes/mana/mana-comment-status.inc | 10 + .../en/includes/mana/mana-report-search-result.inc | 190 +++++++++------ .../prog/en/includes/mana/mana-share-report.inc | 95 ++++++++ .../mana/mana-subscription-search-result.inc | 138 ++++++----- .../prog/en/includes/reports-toolbar.inc | 133 +++-------- .../prog/en/includes/serials-toolbar.inc | 102 ++++---- .../intranet-tmpl/prog/en/modules/acqui/ordered.tt | 6 +- .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 4 +- .../intranet-tmpl/prog/en/modules/acqui/spent.tt | 12 +- .../prog/en/modules/admin/items_search_fields.tt | 2 +- .../prog/en/modules/catalogue/itemsearch.tt | 18 +- .../prog/en/modules/circ/circulation.tt | 1 + .../prog/en/modules/ill/ill-requests.tt | 7 +- .../en/modules/mana/mana-report-search-result.tt | 2 +- .../mana/mana-subscription-search-result.tt | 2 +- .../prog/en/modules/members/boraccount.tt | 11 +- .../prog/en/modules/members/moremember.tt | 1 + .../intranet-tmpl/prog/en/modules/members/pay.tt | 32 +-- .../en/modules/reports/guided_reports_start.tt | 213 ++++++++--------- .../prog/en/modules/serials/serials-search.tt | 1 - .../prog/en/modules/serials/subscription-add.tt | 42 +++- .../prog/en/modules/serials/subscription-detail.tt | 12 +- .../intranet-tmpl/prog/en/modules/tools/letter.tt | 26 +- koha-tmpl/intranet-tmpl/prog/js/holds.js | 70 +++--- koha-tmpl/intranet-tmpl/prog/js/mana.js | 83 +++++++ .../intranet-tmpl/prog/js/subscription-add.js | 249 +++++++++++--------- koha-tmpl/opac-tmpl/bootstrap/css/opac.css | 2 +- koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss | 12 +- .../bootstrap/en/includes/account-table.inc | 14 +- .../bootstrap/en/modules/opac-advsearch.tt | 17 +- .../bootstrap/en/modules/opac-course-details.tt | 8 +- .../bootstrap/en/modules/opac-course-reserves.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 4 +- misc/cronjobs/overdue_notices.pl | 2 + opac/opac-export.pl | 7 + opac/opac-reserve.pl | 14 ++ opac/sco/sco-main.pl | 2 +- svc/mana/search | 5 +- t/db_dependent/Circulation.t | 9 +- t/db_dependent/Installer.t | 8 +- .../Koha/Acquisition/Invoice/Adjustments.t | 10 +- t/db_dependent/Reserves.t | 2 +- 57 files changed, 1002 insertions(+), 718 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/mana.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-comment-status.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-share-report.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/js/mana.js hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 12 14:03:10 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 12 Apr 2019 12:03:10 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-1102-g8eb22ef 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 8eb22efa0893849e2967e34c821c018c6405f8d3 (commit) via d9e9c8545171524c1d1771a98642aa94cc17e74c (commit) via 776e552b40258b960c964d7d0baa6a801db23d24 (commit) via 8ad273c12592fd8fe0bb18c4d542e714cc4252dc (commit) via cff05f88725e51001ad7c8b409f352570909d460 (commit) via 7ff3f68e20ae8739799ec015a82a7eb7a25cf1bf (commit) via 65de5781f2b7fa3bc2e8598573050725b2aeaca0 (commit) via 73bc117b057bd5ea73c4075d586b644b0cafe00b (commit) via 7b90dace95e4c289a2b36b5f95d9116dbd5440db (commit) via 8c038b9eab64d16c08a66218ab5bc631ce6a0b09 (commit) via 2ecca43004685408d999e2b0a765c55a32c404c5 (commit) via dbe541a99bcd0753f5c050bfdf3b786399c78b1d (commit) via 994245e09b6a19df14a4319ed231cc2c5bf087ed (commit) via 1fe39ed657bbc1e45181860cc1d9a2d29aff08d6 (commit) via 920ac202dc1f91e51f43dd07822636c5bbee6a48 (commit) via 0f02c37aab5e2b2cbffbc2fb84e16b5355a33bcf (commit) via 8c7bc8946b4d100da841916b4fe5fa12c2505fb5 (commit) via 79f1008c7ed97117c248c6aead8742bc64dd0353 (commit) via 8b3f1cb151787d742886a328225ceb07d202f2f5 (commit) from 08f02c1aa5a6ae1f1ee3b10a086831c1a2dbcb66 (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 8eb22efa0893849e2967e34c821c018c6405f8d3 Author: Thatcher Leonard Date: Wed Apr 10 23:23:46 2019 +0000 Bug 18584: Our legacy code contains trailing-spaces This patch removes trailing spaces and replaces tab characters with spaces in the branch transfer limits template. Mentored-by: Owen Leonard Signed-off-by: Martin Renvoize Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit d9e9c8545171524c1d1771a98642aa94cc17e74c Author: Nick Clemens Date: Fri Apr 12 02:01:05 2019 +0000 Bug 21953: DBRev 18.12.00.043 Signed-off-by: Nick Clemens commit 776e552b40258b960c964d7d0baa6a801db23d24 Author: Martin Renvoize Date: Tue Apr 9 12:03:22 2019 +0100 Bug 21953: Clarify PF = Lost item processing fee Currently PF is only ever used for lost item processing fees. This patch alters the end user faceing description to clarify that. Note: It may be nice to make the code more descriptive too at some point, but that can happen in another bug in my opinion. Signed-off-by: Martin Renvoize Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 8ad273c12592fd8fe0bb18c4d542e714cc4252dc Author: Martin Renvoize Date: Tue Apr 9 12:00:16 2019 +0100 Bug 21953: (QA follow-up) Corrections to DB Update Signed-off-by: Martin Renvoize Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit cff05f88725e51001ad7c8b409f352570909d460 Author: Jonathan Druart Date: Wed Mar 6 16:09:06 2019 -0300 Bug 21953: Update existing rows in DB Signed-off-by: Hayley Mapley Test plan passes. Signed-off-by: Martin Renvoize Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 7ff3f68e20ae8739799ec015a82a7eb7a25cf1bf Author: Jonathan Druart Date: Wed Mar 6 16:00:09 2019 -0300 Bug 21953: Add tests Signed-off-by: Martin Renvoize Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 65de5781f2b7fa3bc2e8598573050725b2aeaca0 Author: Caroline Cyr La Rose Date: Thu Dec 20 17:12:21 2018 -0500 Bug 21953: Term 'Lost item' untranslatable This patch removes the hardcoded untranslatable string 'Lost item' from C4/Circulation.pm. To test: 1) Make sure the system preference WhenLostChargeReplacementFee is set to Charge 2) Optional: in Administration > Item types, add a default replacement cost to the item type you plan to use 3) Loan an item out to a patron (If there is no default replacement cost, make sure the item has a replacement price) 4) In the patron's account > Details > Loans, click on the item's barcode 5) Set the lost status to Lost 6) Go back to the patron's account > Fines 7) Notice it is written 'Lost item , Lost item title barcode (title)' 8) If you have another language installed, switch to the other language and notice the second Lost item is still in English 9) Apply the patch 10) Redo steps 3-6 11) Notice it is written 'Lost item, title barcode (title)' 12) Optional: switch to another language, notice there is no English string Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 73bc117b057bd5ea73c4075d586b644b0cafe00b Author: Arthur Suzuki Date: Wed Mar 27 15:49:04 2019 +0100 Bug 22597: Remove "more_subfields_xml" from GetPatronInfo response Test plan 1/ Set an item with some xml data in more_subfields_xml 2/ Issue this item to a borrower 3/ Query the webservice with GetPatronInfo methods and show_loans=1 params 4/ Check no tags are returned in the xml response from the webservice Signed-off-by: Katrin Fischer Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit 7b90dace95e4c289a2b36b5f95d9116dbd5440db Author: Katrin Fischer Date: Wed Feb 6 00:14:01 2019 +0000 Bug 19648: Revise marc21_field_007.xml - Removes some doubled up entries - Fixes some whitespace issues - Adds some missing entries, for example: 007, nonprojected graphic, secondary support material a-c To test: - Verify that the 007 cataloging plugin works correctly and matches standard: http://www.loc.gov/marc/bibliographic/bd007k.html Signed-off-by: Martin Renvoize Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit 8c038b9eab64d16c08a66218ab5bc631ce6a0b09 Author: Liz Rea Date: Tue Apr 9 17:49:00 2019 +0000 Bug 18387: (QA Follow up) adding specificity to error template. Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit 2ecca43004685408d999e2b0a765c55a32c404c5 Author: Nick Clemens Date: Mon Jul 9 13:30:38 2018 +0000 Bug 18387: Allow sco-user to access errors templates To test: 1 - Enable AuthoSelfCheck prefs 2 - In opacuserjs or scouserjs add a fetch of an unreachable resources 3 - Visit the SCO 4 - Sign in as a patron then click 'finish' 5 - Say 'yes' to receipt 6 - Note you are directed to log in 7 - Apply patch 8 - Restart all the things 9 - Repeat 4 & 5 10 - Sucess, receipt prints Signed-off-by: Liz Rea Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit dbe541a99bcd0753f5c050bfdf3b786399c78b1d Author: Martin Renvoize Date: Tue Apr 9 13:24:05 2019 +0100 Bug 22628: Add VOID and FFOR to relevant templates This patch adds the VOID and FFOR codes to the releveant templates for display purposes Signed-off-by: Martin Renvoize Signed-off-by: Liz Rea Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 994245e09b6a19df14a4319ed231cc2c5bf087ed Author: Nick Clemens Date: Fri Apr 12 01:43:44 2019 +0000 Bug 21891: DBRev 18.12.00.042 Signed-off-by: Nick Clemens commit 1fe39ed657bbc1e45181860cc1d9a2d29aff08d6 Author: Owen Leonard Date: Thu Apr 11 11:03:20 2019 +0000 Bug 21891: (follow-up) Update database to set blank values to "default" This patch adds a database update which will update any blank values of the XSLTDetailsDisplay system preference to "default." Although a blank value will still result in the default XSLT view, it's more consistent with the other XSLT preferences to use "default." To test, apply the patch and set the XSLTDetailsDisplay to a blank value. Run the database update. The value of the XSLTDetailsDisplay system preference should now be "default." Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 920ac202dc1f91e51f43dd07822636c5bbee6a48 Author: Owen Leonard Date: Tue Nov 27 17:32:51 2018 +0000 Bug 21891: Remove non-XSLT detail view in the staff client This patch removes the non-XSLT markup from the bibliographic detail page in the staff client. The XSLTDetailsDisplay preference has been altered to accommodate this change. A blank value in XSLTDetailsDisplay will now be equivalent to "default." To test, apply the patch and set the value of XSLTDetailsDisplay to either blank or "default." View the detail page for a bibliographic record in the staff client. The XSLT view should be shown. Signed-off-by: Michal Denar Signed-off-by: Nick Clemens commit 0f02c37aab5e2b2cbffbc2fb84e16b5355a33bcf Author: Katrin Fischer Date: Wed Apr 10 20:42:22 2019 +0000 Bug 22501: Add raw filter to course reserves summary page Fixes another place where the public note is shown: - Course reserves module start/summary page Signed-off-by: Nick Clemens commit 8c7bc8946b4d100da841916b4fe5fa12c2505fb5 Author: Liz Rea Date: Tue Apr 9 17:56:43 2019 +0000 Bug 22501: (QA follow-up) use $raw for the note in the intranet Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 79f1008c7ed97117c248c6aead8742bc64dd0353 Author: Lucas Gass Date: Tue Mar 26 17:41:36 2019 +0000 Bug 22501: OPAC course reserves notes should allow html links Signed-off-by: Liz Rea Signed-off-by: Katrin Fischer Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 8b3f1cb151787d742886a328225ceb07d202f2f5 Author: Martin Renvoize Date: Mon Apr 8 18:04:14 2019 +0100 Bug 22642: Corrections to updatedatebase for bug 12395 Signed-off-by: Martin Renvoize Signed-off-by: Liz Rea Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: C4/Auth.pm | 2 +- C4/Circulation.pm | 2 +- C4/ILSDI/Services.pm | 1 + Koha.pm | 2 +- catalogue/detail.pl | 2 +- installer/data/mysql/updatedatabase.pl | 17 +- .../prog/en/data/marc21_field_007.xml | 89 ++++++----- .../intranet-tmpl/prog/en/includes/accounts.inc | 3 +- .../en/modules/admin/branch_transfer_limits.tt | 78 +++++----- .../en/modules/admin/preferences/staff_client.pref | 2 +- .../prog/en/modules/catalogue/detail.tt | 162 +------------------- .../en/modules/course_reserves/course-details.tt | 2 +- .../en/modules/course_reserves/course-reserves.tt | 4 +- .../bootstrap/en/includes/account-table.inc | 4 +- .../bootstrap/en/modules/opac-course-reserves.tt | 2 +- t/db_dependent/Circulation.t | 8 + 16 files changed, 124 insertions(+), 256 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 12 15:17:19 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 12 Apr 2019 13:17:19 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-1120-g7e218b8 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 7e218b81e6f7e4cf8bb8be3aef547cd1c1aac573 (commit) via 76599035cb9f604ea4a94928c82cc8efb396ea73 (commit) via 8c1bd93a3b1fd37e157173e8a1e813def70b1fa3 (commit) via 7205a02a19885d3a1baaab56c8e8749635501104 (commit) via 861fe06ab72be3d905ee5aaa1eca273454354a7a (commit) via e155e6d5bba7b48245b2679d5f0b28d46761db93 (commit) via d96fc928560e5353a805ec079bbde26a7e8dc4ce (commit) via a6466f1f3b02915f0c4e578ce13455ad3aacf46c (commit) via 13f953317a64f66303db46424baacf15d962c0bd (commit) via 6388ffd7025290b1ca3e4c9b7a1ae67dfb63ed72 (commit) via 0059dc5a4041f13db11689f9df1bc6475ab45172 (commit) via 376d1a70232e7c0e96adbd7c5300ce593c0e120a (commit) via e55b627603450313954b98704e73d0baa3ed56f9 (commit) via dea4f3caaadabc8977453615eb162d8403fa5b5d (commit) via e8fc66f0f612ce6516089894b28899522d13021e (commit) via ace782a1f354c675661d70fa9714ed114364c4b9 (commit) via 698efcc0aa2ae48b879b843857e6f12316d5ba83 (commit) via a0e61d8c3e94f2b9e990cc2b60668187047b24bb (commit) from 8eb22efa0893849e2967e34c821c018c6405f8d3 (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 7e218b81e6f7e4cf8bb8be3aef547cd1c1aac573 Author: Nick Clemens Date: Fri Apr 12 02:52:58 2019 +0000 Bug 21953: (follow-up) Fix test count Signed-off-by: Nick Clemens commit 76599035cb9f604ea4a94928c82cc8efb396ea73 Author: Nick Clemens Date: Fri Apr 12 02:52:02 2019 +0000 Bug 10796: Schema changes Signed-off-by: Nick Clemens commit 8c1bd93a3b1fd37e157173e8a1e813def70b1fa3 Author: Nick Clemens Date: Fri Apr 12 02:41:53 2019 +0000 Bug 10796: DBRev 18.12.00.045 Signed-off-by: Nick Clemens commit 7205a02a19885d3a1baaab56c8e8749635501104 Author: Nick Clemens Date: Fri Apr 12 02:36:26 2019 +0000 Bug 21890: DBRev 18.12.00.044 Signed-off-by: Nick Clemens commit 861fe06ab72be3d905ee5aaa1eca273454354a7a Author: Liz Rea Date: Wed Mar 27 19:16:56 2019 +0000 Bug 10796: (QA follow-up) Changing password recovery verbiage for users who are disallowed online password resets Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit e155e6d5bba7b48245b2679d5f0b28d46761db93 Author: Tomas Cohen Arazi Date: Wed Feb 20 13:58:35 2019 -0300 Bug 10796: Use $category->effective_change_password in the OPAC This patch makes the OPAC pages that rely on OpacPasswordChange use the current patron's category to make the decision to allow password change or not. It does so by making sure all the places in which OpacPasswordChange was used, use $logged_in_user->category->effective_change_password instead. Special attention is required on the case of opac-registration-verify.pl in which the use of an unblessed Koha::Patron object is changed in favour of the blessed object, so we can actually use the new method to make a decision on the text to display. To test: - Go through the OPAC pages, check that the password change strings and links are displayed only whne appropriate. - Sign off :-D Signed-off-by: Liz Rea Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit d96fc928560e5353a805ec079bbde26a7e8dc4ce Author: Tomas Cohen Arazi Date: Wed Feb 20 13:36:55 2019 -0300 Bug 10796: Handle can_change_password on the staff interface This patch makes the staff interface handle the new flag when editing the categories. I didn't add the flag to the list of categories table because it makes it too big, but can be easily added if required by users or QA. To test: - Along with other patches from this bug, edit patron categories => SUCCESS: Notice the changes are correctly stored - Sign off :-D Signed-off-by: Liz Rea Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit a6466f1f3b02915f0c4e578ce13455ad3aacf46c Author: Tomas Cohen Arazi Date: Wed Feb 20 13:26:18 2019 -0300 Bug 10796: Add Koha::Patron::Category->effective_change_password method This method checks whether the local $self->change_password is set to override the OpacPasswordChange syspref (i.e. if it is set to a bool) or undef, in which case it falls back to the value of the syspref To test: - Apply this patches - Make sure the DB is updated: $ updatedatabase - Update the schema files: $ dbic - Run: $ kshell k$ prove t/db_dependent/Koha/Patron/Category.t => SUCCESS: Tests pass! - Sign off :-D Signed-off-by: Liz Rea Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 13f953317a64f66303db46424baacf15d962c0bd Author: Tomas Cohen Arazi Date: Wed Feb 20 13:18:00 2019 -0300 Bug 10796: DB update Signed-off-by: Liz Rea Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 6388ffd7025290b1ca3e4c9b7a1ae67dfb63ed72 Author: Martin Renvoize Date: Mon Apr 1 18:46:21 2019 +0100 Bug 21890: (QA follow-up) Use List::Util::any When possible it's a good idea to use `any` from List::Util to shortcut on the first occurence of a truthy value. Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 0059dc5a4041f13db11689f9df1bc6475ab45172 Author: Tomas Cohen Arazi Date: Fri Mar 22 11:22:00 2019 -0300 Bug 21890: Wrap message in span Signed-off-by: Tomas Cohen Arazi Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 376d1a70232e7c0e96adbd7c5300ce593c0e120a Author: Tomas Cohen Arazi Date: Thu Jan 31 16:29:30 2019 -0300 Bug 21890: Allow restricting password resets by patron category This patch makes the templates relying on the OpacResetPassword syspref use the introduced TT plugin method instead by changing: [% IF Koha.Preference('OpacResetPassword') %] => [% IF Categories.can_any_reset_password %] To test: - Verify that all the places in which the 'forgot password' link is displayed in OPAC keep working, provided there's at least one category that has the flag set - Attempt to recover the password for a patron that belong to a valid category (i.e. that has the flag set) => SUCCESS: You can go through the normal process - Attempt to recover the password for a patron that belongs to a category with the flag unset. => SUCCESS: Once Koha identifies your category, you are told you are not allowed to do it - Sign off :-D Signed-off-by: Liz Rea Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit e55b627603450313954b98704e73d0baa3ed56f9 Author: Tomas Cohen Arazi Date: Thu Jan 31 16:27:10 2019 -0300 Bug 21890: Add can_any_reset_password() to the Categories TT plugin This patch introduces a method to the Koha::Template::Plugin::Categories TT plugin. This methods queries for categories filtering them by effective_reset_password flag set, and returns a boolean representing the fact that there's at least one category allowed. To test: - Apply this patch - Run: $ kshell k$ prove t/db_dependent/Template/Plugin/Categories.t => SUCCESS: Tests pass! - Sign off :-D Caveat: this patch/tests require the schema to be updated Signed-off-by: Liz Rea Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit dea4f3caaadabc8977453615eb162d8403fa5b5d Author: Tomas Cohen Arazi Date: Tue Feb 5 16:44:14 2019 -0300 Bug 21890: Add Koha::Patron::Category->effective_reset_password method This method checks wether the local $self->reset_password is set to override the OpacResetPassword syspref (i.e. if it is set to a bool) or undef, in which case if falls back to the value of the syspref. To test: - Apply this patches - Make sure the DB is updated: $ updatedatabase - Update the schema files: $ dbic - Run: $ kshell k$ prove t/db_dependent/Koha/Patron/Category.t => SUCCESS: Tests pass! - Sign off :-D Signed-off-by: Liz Rea Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit e8fc66f0f612ce6516089894b28899522d13021e Author: Tomas Cohen Arazi Date: Thu Jan 31 16:28:39 2019 -0300 Bug 21890: Handle can_reset_password on the staff interface This patch makes the staff interface handle the new flag when editing the categories. I didn't add the flag to the list of categories table because it makes it too big, but can be easily added if required by users or QA. To test: - Along with other patches from this bug, edit patron categories => SUCCESS: Notice the changes are correctly stored - Sign off :-D Signed-off-by: Liz Rea Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit ace782a1f354c675661d70fa9714ed114364c4b9 Author: Tomas Cohen Arazi Date: Thu Jan 31 16:25:59 2019 -0300 Bug 21890: DB updates This patch adds a new column to the categories table: 'reset_password' which is a boolean, and represents, well... that. The value itself is nullable. The idea is that OpacResetPassword governs the general behaviour, and this can be overriden at category-level. Signed-off-by: Liz Rea Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 698efcc0aa2ae48b879b843857e6f12316d5ba83 Author: Owen Leonard Date: Fri Mar 29 19:01:19 2019 +0000 Bug 21582: Use CodeMirror for *UserJS & *UserCSS This patch adds CodeMirror syntax highlighting by default to JS and CSS system preferences. HTML preferences will use CodeMirror editors if UseWYSIWYGinSystemPreferences is disabled. Three new CodeMirror files are added to support three new syntax highlighting modes: XML (for HTML), CSS, and JS. A new option is added to *.pref file configurations for textareas which are intended for HTML, JS, or CSS: syntax. This option is passed to the CodeMirror configuration to control syntax highlighting mode. Textareas without a syntax option specified will not have CodeMirror enabled. To test, apply the patch and go to Administration -> System preferences. Test the behavior of several preferences which use