From 756de066c0ff511b957877a8580eb9e092ba4a40 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 15 Dec 2009 13:11:00 -0500 Subject: [PATCH] Fix for Bug 3926 (suggestion edit form combines data) Breaking patron information variable into separate surname, firstname, branch, category, and borrowernumber variables and using those variables to tweak the display. --- .../prog/en/modules/suggestion/suggestion.tmpl | 6 +++--- suggestion/suggestion.pl | 11 ++++++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl index f29bfd8..058c631 100755 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl @@ -111,18 +111,18 @@ $(document).ready(function() { Suggestion creation "/> - "/> + "/>">, () Suggestion management " /> - "/> + "/>">, () Suggestion Accepted " /> - "/> + "/>">, () diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl index 8f69148..2305b8f 100755 --- a/suggestion/suggestion.pl +++ b/suggestion/suggestion.pl @@ -196,9 +196,14 @@ foreach my $element qw(managedby suggestedby){ $debug || warn $$suggestion_ref{$element}; if ($$suggestion_ref{$element}){ my $member=GetMember(borrowernumber=>$$suggestion_ref{$element}); - my $presentation_string=$$member{firstname}." ".$$member{surname}." ".GetBranchName($$member{branchcode})." ".$$member{description}." ".$$member{category_type}; - $debug || warn $presentation_string; - $template->param($element."information"=>$presentation_string); + $template->param( + $element."_borrowernumber"=>$$member{borrowernumber}, + $element."_firstname"=>$$member{firstname}, + $element."_surname"=>$$member{surname}, + $element."_branchcode"=>$$member{branchcode}, + $element."_description"=>$$member{description}, + $element."_category_type"=>$$member{category_type} + ); } } $template->param( -- 1.6.3.3