Bugzilla – Attachment 35632 Details for
Bug 13021
DataTables server-side processing - guarantor search
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 13021: Fix conflict with bug 8096
PASSED-QA-Bug-13021-Fix-conflict-with-bug-8096.patch (text/plain), 1.50 KB, created by
Kyle M Hall (khall)
on 2015-01-30 14:44:55 UTC
(
hide
)
Description:
[PASSED QA] Bug 13021: Fix conflict with bug 8096
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2015-01-30 14:44:55 UTC
Size:
1.50 KB
patch
obsolete
>From 55e9501da4fbc1171e06cd56ba798ba3b60a2ef5 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Fri, 30 Jan 2015 15:40:33 +0100 >Subject: [PATCH] [PASSED QA] Bug 13021: Fix conflict with bug 8096 > >Bug 8096 added new breaklines, the corrupt the json string. >This patch removes them. > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > .../prog/en/includes/patron-title.inc | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc >index 88b0f3f..056134b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc >@@ -8,9 +8,9 @@ > [%- borrower.firstname %] [% IF borrower.othernames %] ([% borrower.othernames %]) [% END %] [% borrower.surname %] > [%- END -%] > [%- END -%] >- [% IF ( borrower.cardnumber ) %] >+ [%- IF borrower.cardnumber -%] > ([% borrower.cardnumber %]) >- [% END %] >+ [%- END -%] > [%- ELSIF ( borrowernumber ) %] > [%- IF category_type == 'I' %] > [%- surname %] [% IF othernames %] ([% othernames %]) [% END %] >@@ -21,7 +21,7 @@ > [%- firstname %] [% IF othernames %] ([% othernames %]) [% END %] [% surname %] > [%- END %] > [%- END -%] >- [% IF ( cardnumber ) %] >+ [%- IF cardnumber -%] > ([% cardnumber %]) >- [% END %] >+ [%- END -%] > [%- END -%] >-- >1.7.2.5
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 13021
:
31970
|
31971
|
31972
|
32231
|
32232
|
32233
|
35296
|
35297
|
35321
|
35322
|
35323
|
35324
|
35371
|
35627
|
35628
|
35629
|
35630
|
35631
|
35632