Merge remote-tracking branch 'origin/new/bug_6720'

diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm
index c92c319..ece46a3 100644 (file)
--- a/C4/AuthoritiesMarc.pm
+++ b/C4/AuthoritiesMarc.pm
@@ -351,6 +351,10 @@ sub SearchAuthorities {
                         $reported_tag .= '$' . $_->[0] . $_->[1];
                     }
                 }
+                my $thisauthtype = GetAuthType(GetAuthTypeCode($authid));
+                $newline{authtype}     = defined ($thisauthtype) ?
+                                            $thisauthtype->{'authtypetext'} :
+                                            GetAuthType($authtypecode)->{'authtypetext'};
                 $newline{summary}      = $summary;
                 $newline{even}         = $counter % 2;
                 $newline{reported_tag} = $reported_tag;

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt
index 9e6c3d6..2f0f3a0 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt
@@ -58,7 +58,7 @@
                 <tr>
             [% END %]
                     <td>[% PROCESS authresult summary=resul.summary %]</td>
-                    <td>[% authtypetext %]</td>
+                    <td>[% resul.authtype %]</td>
                                        [% UNLESS ( resul.isEDITORS ) %]
                                                <td>
                                                         <a href="/cgi-bin/koha/opac-search.pl?type=opac&amp;op=do_search&amp;q=an=[% resul.authid %]">[% resul.used %] biblios</a>