From d6d703805aba7e76a998470f9269b63457680185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?= Date: Sun, 2 Nov 2014 18:53:47 +0100 Subject: [PATCH] [Signed-off] Bug 13156 Display borrower's cardnumber who did a suggestion in suggestion.pl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To avoid homonyms, it would be nice if the card number is displayed in the user suggestion.pl. Currently, consult the record of the user to know exactly who made the suggestion. TEST PLAN: Apply the patch. Go on suggestion.pl. Check that nothing has changed, except that cardnumbers are displayed in 'Suggested by' column. Resolved an easy conflict while applying. Followed test plan. Works as expected. Signed-off-by: Marc Véron --- C4/Suggestions.pm | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/C4/Suggestions.pm b/C4/Suggestions.pm index f34c942..d26387e 100644 --- a/C4/Suggestions.pm +++ b/C4/Suggestions.pm @@ -101,6 +101,7 @@ sub SearchSuggestion { B1.branchname AS branchnamesuggestedby, U1.surname AS surnamesuggestedby, U1.firstname AS firstnamesuggestedby, + U1.cardnumber AS cardnumbersuggestedby, U1.email AS emailsuggestedby, U1.borrowernumber AS borrnumsuggestedby, U1.categorycode AS categorycodesuggestedby, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt index aeb8946..31d90cb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt @@ -516,8 +516,8 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o [% IF ( suggestions_loo.isbn ) %]; ISBN:[% suggestions_loo.isbn |html %] [% END %][% IF ( suggestions_loo.publishercode ) %]; Published by [% suggestions_loo.publishercode |html %] [% END %][% IF ( suggestions_loo.publicationyear ) %] in [% suggestions_loo.publicationyear |html %] [% END %][% IF ( suggestions_loo.place ) %] in [% suggestions_loo.place |html %] [% END %][% IF ( suggestions_loo.collectiontitle ) %]; [% suggestions_loo.collectiontitle |html %] [% END %][% IF ( suggestions_loo.itemtype ) %]; [% suggestions_loo.itemtype |html %] [% END %]
[% IF ( suggestions_loo.note ) %][% suggestions_loo.note |html%][% END %] - [% IF ( suggestions_loo.emailsuggestedby ) %][% END %][% suggestions_loo.surnamesuggestedby %][% IF ( suggestions_loo.firstnamesuggestedby ) %], [% suggestions_loo.firstnamesuggestedby %][% END %] [% IF ( suggestions_loo.emailsuggestedby ) %][% END %] - [% IF ( suggestions_loo.suggesteddate ) %] - [% suggestions_loo.suggesteddate | $KohaDates %][% END %] + [% IF ( suggestions_loo.emailsuggestedby ) %][% END %][% suggestions_loo.surnamesuggestedby %][% IF ( suggestions_loo.firstnamesuggestedby ) %], [% suggestions_loo.firstnamesuggestedby %][% END %] [% IF (suggestions_loo.cardnumbersuggestedby ) %]([% suggestions_loo.cardnumbersuggestedby %])[% END %] [% IF ( suggestions_loo.emailsuggestedby ) %][% END %] + [% IF ( suggestions_loo.suggesteddate ) %] - [% suggestions_loo.suggesteddate %][% END %] [% IF ( suggestions_loo.emailmanagedby ) %][% END %][% suggestions_loo.surnamemanagedby %][% IF ( suggestions_loo.firstnamemanagedby ) %], [% suggestions_loo.firstnamemanagedby %][% END %] [% IF ( suggestions_loo.emailmanagedby ) %][% END %] -- 1.7.10.4