From 2aecda9a1d5548479a4ca4351d41cea3d2168ce3 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 9 Jun 2014 12:21:31 +0200 Subject: [PATCH] Bug 11742: FIX the code parameter was not take into account In C4::Letters::GetLetters, the code filter was not used as a query parameter. Moreover, the JS code was buggy. We only need to check the letter code, except if it is an edit and the letter code has not been changed. --- C4/Letters.pm | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt | 13 +++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/C4/Letters.pm b/C4/Letters.pm index ff63aac..1d916e0 100644 --- a/C4/Letters.pm +++ b/C4/Letters.pm @@ -85,6 +85,7 @@ sub GetLetters { . ( $code ? q| AND code = ?| : q|| ) . q| GROUP BY code ORDER BY name|, { Slice => {} } , ( $module ? $module : () ) + , ( $code ? $code : () ) ); return $letters; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt index 34df1e7..7964e41 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt @@ -59,7 +59,10 @@ $(document).ready(function() { return false; } [% END %] - if ( new_lettercode != '[% code %]' ) { + + [% IF ( add_form and code ) # IF edit %] + if ( new_lettercode != '[% code %]' ) { + [% END %] $.ajax({ data: { code: new_lettercode }, type: 'GET', @@ -73,9 +76,11 @@ $(document).ready(function() { } }, }); - } else { - $("#add_notice").submit(); - } + [% IF ( add_form and code ) %] + } else { + $("#add_notice").submit(); + } + [% END %] }); var sms_limit = 160; -- 2.0.0.rc2