From 8e1ab9522f8a9323bf0716df02f8103ee2a5a386 Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Tue, 9 Jul 2024 20:19:05 +0000 Subject: [PATCH] Bug 37294: Add modal to generate next To test: 1. Serials -> Create or find a subscription 2. Receive the subscription 3. Save 4. Click 'Generate next' 5. Nothing happens 6. APPLY PATCH 7. Try again, now the "Generate next" button should work as expected. Signed-off-by: Kelly Signed-off-by: Martin Renvoize Signed-off-by: Katrin Fischer (cherry picked from commit 56cbc1f09295fe84dd67a93f73870e4d0fbeaae4) Signed-off-by: Lucas Gass --- .../prog/en/includes/modals/generate_next.inc | 21 +++++++++++++++++++ .../en/modules/serials/serials-collection.tt | 11 ++++------ 2 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/modals/generate_next.inc diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/generate_next.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/generate_next.inc new file mode 100644 index 0000000000..cc31c9edf5 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/generate_next.inc @@ -0,0 +1,21 @@ + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt index d28b403f60..362e97b6e2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt @@ -39,6 +39,9 @@ [% INCLUDE 'modals/serials_skip_issues.inc' %] + [% INCLUDE 'modals/generate_next.inc' %] + + [% UNLESS ( popup ) %] [% INCLUDE 'serials-toolbar.inc' %] @@ -182,7 +185,7 @@
[% UNLESS subscription.closed %]
- +
@@ -352,12 +355,6 @@ } } - function generateNext(subscriptionid) { - if(confirm(_("Do you really want to generate next serial?"))){ - document.location = 'serials-collection.pl?op=gennext&subscriptionid='+subscriptionid; - } - } - $(document).ready(function() { if( $("#subscription_years .tab-pane.active").length < 1 ){ $("#subscription_years a:first").tab("show"); -- 2.39.5