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.

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 (executable)
--- 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() {
             <tr>
                 <td>Suggestion creation </td>
                 <td><input type="text" id="suggesteddate" name="suggesteddate" size="10" maxlentgh="10" value="<!--TMPL_VAR Name="suggesteddate"-->"/></td>
-                <td><input type="hidden" id="suggestedby" name="suggestedby" value="<!--TMPL_VAR Name="suggestedby"-->"/><!--TMPL_VAR Name="suggestedbyinformation"-->
+                <td><input type="hidden" id="suggestedby" name="suggestedby" value="<!--TMPL_VAR Name="suggestedby"-->"/><!-- TMPL_IF NAME="suggestedby_borrowernumber" --><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="suggestedby_borrowernumber" -->"><!--TMPL_VAR Name="suggestedby_surname"-->, <!-- TMPL_VAR NAME="suggestedby_firstname" --></a>  <!-- TMPL_VAR NAME="suggestedby_branchcode" --> (<!-- TMPL_VAR NAME="suggestedby_description" -->)<!-- /TMPL_IF -->
                 </td>
             </tr>
             <tr>
                 <td>Suggestion management </td>
                 <td><input type="text" id="managedon" name="manageddate" size="10" maxlength="10" value="<!--TMPL_VAR Name="manageddate"-->" /></td>
-                <td><input type="hidden" id="managedby" name="managedby" value="<!--TMPL_VAR Name="managedby"-->"/><!--TMPL_VAR Name="managedbyinformation"--></td>
+                <td><input type="hidden" id="managedby" name="managedby" value="<!--TMPL_VAR Name="managedby"-->"/><!-- TMPL_IF NAME="managedby_borrowernumber" --><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="managedby_borrowernumber" -->"><!--TMPL_VAR Name="managedby_surname"-->, <!-- TMPL_VAR NAME="managedby_firstname" --></a> <!-- TMPL_VAR NAME="managedby_branchcode" --> (<!-- TMPL_VAR NAME="managedby_description" -->)<!-- /TMPL_IF --></td>
             </tr>
             <tr>
                 <td>Suggestion Accepted </td>
                 <td><input type="text" id="accepteddate" name="accepteddate" size="10" maxlength="10" value="<!--TMPL_VAR Name="accepteddate"-->" /></td>
-                <td><input type="hidden" id="acceptedby" name="acceptedby" value="<!--TMPL_VAR Name="acceptedby"-->"/><!--TMPL_VAR Name="acceptedbyinformation"--></td>
+                <td><input type="hidden" id="acceptedby" name="acceptedby" value="<!--TMPL_VAR Name="acceptedby"-->"/><!-- TMPL_IF NAME="acceptedby_borrowernumber" --><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="acceptedby_borrowernumber" -->"><!--TMPL_VAR Name="acceptedby_surname"-->, <!-- TMPL_VAR NAME="acceptedby_firstname" --></a> <!-- TMPL_VAR NAME="acceptedby_branchcode" --> (<!-- TMPL_VAR NAME="acceptedby_description" -->)<!-- /TMPL_IF --></td>
             </tr>
             </tbody>
         </table>

diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl
index 85b3eb5..36bdcbc 100755 (executable)
--- a/suggestion/suggestion.pl
+++ b/suggestion/suggestion.pl
@@ -198,9 +198,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(