Bugzilla – Attachment 29051 Details for
Bug 11742
Overdue notice/status triggers displaying the wrong notice for default
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 11742: FIX the code parameter was not take into account
PASSED-QA-Bug-11742-FIX-the-code-parameter-was-not.patch (text/plain), 2.09 KB, created by
Katrin Fischer
on 2014-06-19 15:24:11 UTC
(
hide
)
Description:
[PASSED QA] Bug 11742: FIX the code parameter was not take into account
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2014-06-19 15:24:11 UTC
Size:
2.09 KB
patch
obsolete
>From fb59817d8a018b8843e3e20052162f3ea118f73f Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Mon, 9 Jun 2014 12:21:31 +0200 >Subject: [PATCH] [PASSED QA] 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. > >Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> >Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> >--- > 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; >-- >1.8.3.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 11742
:
25892
|
28020
|
28021
|
28687
|
28688
|
28729
|
28956
|
29049
|
29050
| 29051 |
29180