@@ -, +, @@
dropdown if organized by library
---
.../prog/en/modules/suggestion/suggestion.tt | 13 ++++++++-----
suggestion/suggestion.pl | 5 +++--
2 files changed, 11 insertions(+), 7 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
@@ -500,11 +500,13 @@
Suggestions management
-
-
+[% IF ( displayby != "branchcode" ) %]
+
+
+[% END %]
[% FOR m IN messages %]
@@ -534,6 +536,7 @@
[% ELSIF (suggestion.suggestiontypelabel == "Available") %]Available
[% ELSIF (suggestion.suggestiontypelabel == "Ordered") %]Ordered
[% ELSIF (suggestion.suggestiontypelabel == "Unknown") %]Status unknown
+ [% ELSIF (suggestion.suggestiontypelabel == "__ANY__") %]Any
[% ELSE %][% suggestion.suggestiontypelabel | html %][% END %]
[% ELSE %]
[% IF ( suggestion.suggestiontype ) %]
--- a/suggestion/suggestion.pl
+++ a/suggestion/suggestion.pl
@@ -61,8 +61,9 @@ sub GetCriteriumDesc{
}
return ($criteriumvalue eq 'ASKED'?"Pending":ucfirst(lc( $criteriumvalue))) if ($displayby =~/status/i);
}
- return Koha::Libraries->find($criteriumvalue)->branchname
- if $displayby =~ /branchcode/;
+ if ( $displayby =~ /branchcode/ ) {
+ return $criteriumvalue ? Koha::Libraries->find($criteriumvalue)->branchname : "__ANY__";
+ }
if ( $displayby =~ /itemtype/ ) {
my $av = Koha::AuthorisedValues->search({ category => 'SUGGEST_FORMAT', authorised_value => $criteriumvalue });
return $av->count ? $av->next->lib : 'Unknown';
--