Created attachment 190827 [details] [review] Bug 41512: Fix ILLCheckAvailability 1) Install the unpaywall plugin: https://github.com/openfifth/koha-plugin-ill-avail-unpaywall/releases/tag/1.0.2 2) Configure an email address on the plugin configuration (I believe any email address should work): <staff_url>/cgi-bin/koha/plugins/run.pl?class=Koha%3A%3APlugin%3A%3ACom%3A%3APTFSEurope%3A%3AAvailabilityUnpaywall&method=configure 3) Enable ILLModule and ILLCheckAvailability sys prefs 4) Create a new ILL request, visit: <staff_url>/cgi-bin/koha/ill/ill-requests.pl?method=create&backend=Standard 5) Pick type: journal article and enter the DOI: 10.1002/bjs.1800621024 6) Enter a cardnumber e.g. '42' for koha user and any library. 7) Notice the availability screen never renders, a console error is logged on the browser. 8) Apply patch. Refresh. Repeat. This appears to have stopped working after bug 26553. Using git bisect, after bug 26553 (cc09868152f7e1c4a0883a5ebf3dfa948827a384), this started returning a 'bad request: malformed query string' because query params were being sent to the plugin API route (which doesn't consider them). Bug 40865 then fixed the bad request error, but resulted in the console error we see now, which is fixed by this patch. ajax.dataSrc appears to now be returning an additional level of 'data' due to datatables upgrade (?), this patch changes the dataSrc override to be more in line with the example doc at https://datatables.net/reference/option/ajax.dataSrc
Created attachment 190853 [details] [review] Bug 41512: Fix ILLCheckAvailability 1) Install the unpaywall plugin: https://github.com/openfifth/koha-plugin-ill-avail-unpaywall/releases/tag/1.0.2 2) Configure an email address on the plugin configuration (I believe any email address should work): <staff_url>/cgi-bin/koha/plugins/run.pl?class=Koha%3A%3APlugin%3A%3ACom%3A%3APTFSEurope%3A%3AAvailabilityUnpaywall&method=configure 3) Enable ILLModule and ILLCheckAvailability sys prefs 4) Create a new ILL request, visit: <staff_url>/cgi-bin/koha/ill/ill-requests.pl?method=create&backend=Standard 5) Pick type: journal article and enter the DOI: 10.1002/bjs.1800621024 6) Enter a cardnumber e.g. '42' for koha user and any library. 7) Notice the availability screen never renders, a console error is logged on the browser. 8) Apply patch. Refresh. Repeat. This appears to have stopped working after bug 26553. Using git bisect, after bug 26553 (cc09868152f7e1c4a0883a5ebf3dfa948827a384), this started returning a 'bad request: malformed query string' because query params were being sent to the plugin API route (which doesn't consider them). Bug 40865 then fixed the bad request error, but resulted in the console error we see now, which is fixed by this patch. ajax.dataSrc appears to now be returning an additional level of 'data' due to datatables upgrade (?), this patch changes the dataSrc override to be more in line with the example doc at https://datatables.net/reference/option/ajax.dataSrc Signed-off-by: David Nind <david@davidnind.com>
Created attachment 191747 [details] [review] Bug 41512: (OPAC) Additional fix This is needed or else the OPAC still throws the 'malformed query string' mentioned on the original test plan. This is because the fix from bug 40865 was only applied to intra datatables.js not the OPAC datatables. I don't know why this fixes it for the OPAC, but it does. Joubu, thoughts?
(In reply to Pedro Amorim from comment #3) > Created attachment 191747 [details] [review] [review] > Bug 41512: (OPAC) Additional fix > > This is needed or else the OPAC still throws the 'malformed query string' > mentioned on the original test plan. > This is because the fix from bug 40865 was only applied to intra > datatables.js not the OPAC datatables. > > I don't know why this fixes it for the OPAC, but it does. > > Joubu, thoughts? Without this patch ajax.dataSrc you pass from ill-availability.js is replaced with the one from _dt_default_ajax The patch is correct and must be at the OPAC as well. However I think it should be moved to its own bug.
(In reply to Jonathan Druart from comment #4) > The patch is correct and must be at the OPAC as well. However I think it > should be moved to its own bug. Both fixes target the same version (25.05) so it's not needed to split.
Created attachment 191865 [details] [review] Bug 41512: Fix ILLCheckAvailability 1) Install the unpaywall plugin: https://github.com/openfifth/koha-plugin-ill-avail-unpaywall/releases/tag/1.0.2 2) Configure an email address on the plugin configuration (I believe any email address should work): <staff_url>/cgi-bin/koha/plugins/run.pl?class=Koha%3A%3APlugin%3A%3ACom%3A%3APTFSEurope%3A%3AAvailabilityUnpaywall&method=configure 3) Enable ILLModule and ILLCheckAvailability sys prefs 4) Create a new ILL request, visit: <staff_url>/cgi-bin/koha/ill/ill-requests.pl?method=create&backend=Standard 5) Pick type: journal article and enter the DOI: 10.1002/bjs.1800621024 6) Enter a cardnumber e.g. '42' for koha user and any library. 7) Notice the availability screen never renders, a console error is logged on the browser. 8) Apply patch. Refresh. Repeat. This appears to have stopped working after bug 26553. Using git bisect, after bug 26553 (cc09868152f7e1c4a0883a5ebf3dfa948827a384), this started returning a 'bad request: malformed query string' because query params were being sent to the plugin API route (which doesn't consider them). Bug 40865 then fixed the bad request error, but resulted in the console error we see now, which is fixed by this patch. ajax.dataSrc appears to now be returning an additional level of 'data' due to datatables upgrade (?), this patch changes the dataSrc override to be more in line with the example doc at https://datatables.net/reference/option/ajax.dataSrc Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Created attachment 191866 [details] [review] Bug 41512: (OPAC) Additional fix This is needed or else the OPAC still throws the 'malformed query string' mentioned on the original test plan. This is because the fix from bug 40865 was only applied to intra datatables.js not the OPAC datatables. I don't know why this fixes it for the OPAC, but it does. Joubu, thoughts? Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Nice work everyone! Pushed to main for 26.05