From a86d65c81fdd599072f215d0bca5506e1f13b61a Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 8 Apr 2020 10:42:41 +0200 Subject: [PATCH] Bug 7046: Preselect dropdown option and prefill input With previous renew values Bug 7046: Simplify dropdown list construction Bug 7046: Remove "earlier declaration in same scope" "my" variable $numberpattern masks earlier declaration in same scope at /kohadevbox/koha/serials/subscription-add.pl line 437. Signed-off-by: Jonathan Druart --- .../en/modules/serials/subscription-renew.tt | 38 +++++++------------ serials/subscription-add.pl | 1 - serials/subscription-renew.pl | 1 - 3 files changed, 13 insertions(+), 27 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt index 614e4d5e41..e5f121ee98 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt @@ -38,35 +38,23 @@
  • - (enter amount in numerals) + (enter amount in numerals)
  • diff --git a/serials/subscription-add.pl b/serials/subscription-add.pl index 6fdc1b29d1..f0cb7b53e1 100755 --- a/serials/subscription-add.pl +++ b/serials/subscription-add.pl @@ -434,7 +434,6 @@ sub redirect_mod_subscription { my $subtype = $query->param('subtype'); my $sublength = $query->param('sublength'); my ($numberlength, $weeklength, $monthlength) = GetSubscriptionLength( $subtype, $sublength ); - my $numberpattern = $query->param('numbering_pattern'); my $locale = $query->param('locale'); my $lastvalue1 = $query->param('lastvalue1'); my $innerloop1 = $query->param('innerloop1'); diff --git a/serials/subscription-renew.pl b/serials/subscription-renew.pl index 954b007fac..1889f9a5b6 100755 --- a/serials/subscription-renew.pl +++ b/serials/subscription-renew.pl @@ -135,7 +135,6 @@ my $libraries = Koha::Libraries->search( {}, { order_by => ['branchcode'] }, ); $template->param( op => $op, libraries => $libraries, - subtypes => [ qw( numberlength weeklength monthlength ) ], ); output_html_with_http_headers $query, $cookie, $template->output; -- 2.20.1