|
Description
Andrew Isherwood
2021-08-27 10:51:44 UTC
Created attachment 124174 [details] [review] Bug 28909: Allow illview to use backend template This commit allows illview to use an intranet template supplied by the backend, as per other stages. The template must be named illview.inc Test plan: - Apply the patch - Install FreeForm backend (https://github.com/PTFS-Europe/koha-ill-freeform) - Create a request - On the resulting "Manage ILL request" note the display is normal - Create a new file in the FreeForm backend directory: /intra-includes/illview.inc with the following content: [% BLOCK backend_jsinclude %] <script>(function() { alert("Working!"); })()</script> [% END %] - Restart Plack if enabled - Reload the page => TEST: Observe that the alert specified in the template is displayed Hi Andrew, I tried to test this and it's well possible I misunderstood something, but I am stuck with: Template process failed: file error - : not found at /home/vagrant/kohaclone/C4/Templates.pm line 121 I've triple checked the contents of my illview.inc and I just can't spot any error. Also did multiple restart_all, so Plack should not be the issue. Any ideas? Created attachment 124270 [details] [review] Bug 28909: Fix handling if backend doesn't support If a backend hasn't been updated to support this functionality, we need to handle that gracefully Also, this commit fixes some indentation. Arghhh, sorry Katrin, my mistake. I'd forgotten to push up the patches to the FreeForm backend that makes this work! I now have done so, so if you pull the latest backend, it should be fine. I've also fixed the problem you saw, if a backend hasn't been updated to support this new functionality, it shouldn't break in the way you saw! Hi Andrew, thx! I'll try to come back to this, but it might take a few days. Created attachment 124271 [details] [review] Bug 28909: Fix handling if backend doesn't support If a backend hasn't been updated to support this functionality, we need to handle that gracefully Also, this commit fixes some indentation. Created attachment 129102 [details] [review] Bug 29809: Rename item relation accessor from itemnumber This patch renames the item relation accessor method in StockRotationItem to 'item' from 'itemnumber' to more clearly reflect that the method returns a Koha::Item object and not an itemnumber. Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Created attachment 129103 [details] [review] Bug 29809: Update stockration tool to reflect method name change Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Created attachment 129104 [details] [review] Bug 28909: (follow-up) Update test for warning and rename variable Variable was updated for params, need to update declaration too Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Hi Nick, I think you've attached your patches to the wrong bug I am really sorry I lost sight of this one, Andrew. I'll do better. Could you please rebase? 124271 - Bug 28909: Fix handling if backend doesn't support Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 28909: Fix handling if backend doesn't support error: sha1 information is lacking or useless (Koha/Illrequest.pm). error: could not build fake ancestor Patch failed at 0001 Bug 28909: Fix handling if backend doesn't support Hi Katrin It looks like one of the patches got obsoleted at some point, no idea how that happened! Anyway, it should apply now. I'm just working on a development that depends on this bug, and it applied cleanly, so hopefully you won't have any problems. Created attachment 138856 [details] [review] Bug 28909: Allow illview to use backend template This commit allows illview to use an intranet template supplied by the backend, as per other stages. The template must be named illview.inc Test plan: - Apply the patch - Install FreeForm backend (https://github.com/PTFS-Europe/koha-ill-freeform) - Create a request - On the resulting "Manage ILL request" note the display is normal - Create a new file in the FreeForm backend directory: /intra-includes/illview.inc with the following content: [% BLOCK backend_jsinclude %] <script>(function() { alert("Working!"); })()</script> [% END %] - Restart Plack if enabled - Reload the page => TEST: Observe that the alert specified in the template is displayed Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Created attachment 138857 [details] [review] Bug 28909: Fix handling if backend doesn't support If a backend hasn't been updated to support this functionality, we need to handle that gracefully Also, this commit fixes some indentation. Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Created attachment 138858 [details] [review] Bug 30484: Add ILL update notice Adds a new ILL_REQUEST_UPDATE notice which is to be used for the formation of notices informing users of updates to ILL requests. Commit includes database updates and template changes for messaging preferences Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Created attachment 138922 [details] [review] Bug 28909: Allow illview to use backend template This commit allows illview to use an intranet template supplied by the backend, as per other stages. The template must be named illview.inc Test plan: - Apply the patch - Install FreeForm backend (https://github.com/PTFS-Europe/koha-ill-freeform) - Create a request - On the resulting "Manage ILL request" note the display is normal - Create a new file in the FreeForm backend directory: /intra-includes/illview.inc with the following content: [% BLOCK backend_jsinclude %] <script>(function() { alert("Working!"); })()</script> [% END %] - Restart Plack if enabled - Reload the page => TEST: Observe that the alert specified in the template is displayed Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 138923 [details] [review] Bug 28909: Fix handling if backend doesn't support If a backend hasn't been updated to support this functionality, we need to handle that gracefully Also, this commit fixes some indentation. Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Pushed to master for 22.11. Nice work everyone, thanks! This is marked as an enhancement - I am marking RESOLVED FIXED. But it also seems to have escaped RMaint review? |