From ad368764e9c6c6b6655001ae92caf43983ae9585 Mon Sep 17 00:00:00 2001 From: Joshua Ferraro Date: Sat, 9 Aug 2008 12:06:04 -0500 Subject: [PATCH] 2487: Collection code select boxes in Adv search show both code and description --- admin/authorised_values.pl | 1 + catalogue/search.pl | 2 +- opac/opac-search.pl | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/admin/authorised_values.pl b/admin/authorised_values.pl index 0a672a66fd..49e68b0ae6 100755 --- a/admin/authorised_values.pl +++ b/admin/authorised_values.pl @@ -110,6 +110,7 @@ if ($op eq 'add_form') { my $new_category = $input->param('category'); my $new_authorised_value = $input->param('authorised_value'); my $imageurl=$input->param( 'imageurl' )|''; + $imageurl = '' if $imageurl =~ /removeImage/; my $duplicate_entry = 0; if ( $id ) { # Update diff --git a/catalogue/search.pl b/catalogue/search.pl index f033f5e12d..d6f6788376 100755 --- a/catalogue/search.pl +++ b/catalogue/search.pl @@ -245,7 +245,7 @@ if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') { for my $thisitemtype (@$advsearchtypes) { my %row =( number=>$cnt++, - imageurl=> $imgdir."/".$thisitemtype->{'imageurl'}, + imageurl=> $thisitemtype->{'imageurl'}?($imgdir."/".$thisitemtype->{'imageurl'}):"", ccl => $advanced_search_types, code => $thisitemtype->{authorised_value}, selected => $selected, diff --git a/opac/opac-search.pl b/opac/opac-search.pl index 86b47d8e22..ed8c358cbb 100755 --- a/opac/opac-search.pl +++ b/opac/opac-search.pl @@ -155,7 +155,7 @@ if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') { for my $thisitemtype (@$advsearchtypes) { my %row =( number=>$cnt++, - imageurl=> $imgdir."/".$thisitemtype->{'imageurl'}, + imageurl=> $thisitemtype->{'imageurl'}?($imgdir."/".$thisitemtype->{'imageurl'}):"", ccl => $advanced_search_types, code => $thisitemtype->{authorised_value}, selected => $selected, -- 2.39.5