Bug 14100: Fix some missing occurrences

This patch fixes:
- reports/bor_issues_top.pl
- sort order
- adv search and search results
- opac-topissues.pl

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

diff --git a/C4/Search.pm b/C4/Search.pm
index 31e2484..5c11862 100644 (file)
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -570,7 +570,7 @@ sub getRecords {
                                     {
                                         $facet_label_value =
                                           $itemtypes->{$one_facet}
-                                          ->{'description'};
+                                          ->{translated_description};
                                     }
                                 }
 
@@ -1948,7 +1948,7 @@ sub searchResults {
 
                # edition information, if any
         $oldbiblio->{edition} = $oldbiblio->{editionstatement};
-               $oldbiblio->{description} = $itemtypes{ $oldbiblio->{itemtype} }->{description};
+        $oldbiblio->{description} = $itemtypes{ $oldbiblio->{itemtype} }->{translated_description};
  # Build summary if there is one (the summary is defined in the itemtypes table)
  # FIXME: is this used anywhere, I think it can be commented out? -- JF
         if ( $itemtypes{ $oldbiblio->{itemtype} }->{summary} ) {
@@ -2060,7 +2060,7 @@ sub searchResults {
             foreach my $code ( keys %subfieldstosearch ) {
                 $item->{$code} = $field->subfield( $subfieldstosearch{$code} );
             }
-            $item->{description} = $itemtypes{ $item->{itype} }{description};
+            $item->{description} = $itemtypes{ $item->{itype} }{translated_description};
 
                # OPAC hidden items
             if ($is_opac) {

diff --git a/catalogue/search.pl b/catalogue/search.pl
index 0bd2cc6..c3ec804 100755 (executable)
--- a/catalogue/search.pl
+++ b/catalogue/search.pl
@@ -262,7 +262,7 @@ foreach my $advanced_srch_type (@advanced_search_types) {
    if ($advanced_srch_type eq 'itemtypes') {
    # itemtype is a special case, since it's not defined in authorized values
         my @itypesloop;
-       foreach my $thisitemtype ( sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'} } keys %$itemtypes ) {
+        foreach my $thisitemtype ( sort {$itemtypes->{$a}->{translated_description} cmp $itemtypes->{$b}->{translated_description} } keys %$itemtypes ) {
            my %row =(  number=>$cnt++,
                ccl => "$itype_or_itemtype,phr",
                 code => $thisitemtype,

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc
index 0a211d5..7324e08 100644 (file)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc
@@ -41,7 +41,7 @@
                                 [% ELSE %]
                                     <option value="[% itemtype.itemtype %]">
                                 [% END %]
-                                    [% itemtype.description %]
+                                    [% itemtype.translated_description %]
                                 </option>
                             [% END %]
                         </select>

diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index 7d21354..896a799 100755 (executable)
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -236,13 +236,13 @@ foreach my $advanced_srch_type (@advanced_search_types) {
    if ($advanced_srch_type eq 'itemtypes') {
    # itemtype is a special case, since it's not defined in authorized values
         my @itypesloop;
-       foreach my $thisitemtype ( sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'} } keys %$itemtypes ) {
+        foreach my $thisitemtype ( sort {$itemtypes->{$a}->{translated_description} cmp $itemtypes->{$b}->{translated_description} } keys %$itemtypes ) {
             next if $hidingrules->{itype} && any { $_ eq $thisitemtype } @{$hidingrules->{itype}};
             next if $hidingrules->{itemtype} && any { $_ eq $thisitemtype } @{$hidingrules->{itemtype}};
            my %row =(  number=>$cnt++,
                ccl => "$itype_or_itemtype,phr",
                 code => $thisitemtype,
-                description => $itemtypes->{$thisitemtype}->{'description'},
+                description => $itemtypes->{$thisitemtype}->{translated_description},
                 imageurl=> getitemtypeimagelocation( 'opac', $itemtypes->{$thisitemtype}->{'imageurl'} ),
                 cat => $itemtypes->{$thisitemtype}->{'iscat'},
                 hideinopac => $itemtypes->{$thisitemtype}->{'hideinopac'},

diff --git a/opac/opac-topissues.pl b/opac/opac-topissues.pl
index 8e4e6db..ac240df 100755 (executable)
--- a/opac/opac-topissues.pl
+++ b/opac/opac-topissues.pl
@@ -25,6 +25,7 @@ use warnings;
 use CGI qw ( -utf8 );
 use C4::Auth;
 use C4::Context;
+use C4::Languages;
 use C4::Search;
 use C4::Output;
 use C4::Koha;

diff --git a/reports/bor_issues_top.pl b/reports/bor_issues_top.pl
index eb5482d..485095e 100755 (executable)
--- a/reports/bor_issues_top.pl
+++ b/reports/bor_issues_top.pl
@@ -125,7 +125,7 @@ my $itemtypes = GetItemTypes;
 my @itemtypeloop;
 foreach (sort {$itemtypes->{$a}->{translated_description} cmp $itemtypes->{$b}->{translated_description}} keys %$itemtypes) {
        my %row = (value => $_,
-               description => $itemtypes->{$_}->{translated_description},
+               translated_description => $itemtypes->{$_}->{translated_description},
               );
     push @itemtypeloop, \%row;
 }