sub GetCriteriumDesc{
my ($criteriumvalue,$displayby)=@_;
+ unless ( grep { /$criteriumvalue/ } qw(ASKED ACCEPTED REJECTED CHECKED) ) {
+ return GetAuthorisedValueByCode('SUGGEST_STATUS', $criteriumvalue ) || "Unknown";
+ }
return ($criteriumvalue eq 'ASKED'?"Pending":ucfirst(lc( $criteriumvalue))) if ($displayby =~/status/i);
return (GetBranchName($criteriumvalue)) if ($displayby =~/branchcode/);
return (GetSupportName($criteriumvalue)) if ($displayby =~/itemtype/);
my $returnsuggested = $input->param('returnsuggested');
my $managedby = $input->param('managedby');
my $displayby = $input->param('displayby') || '';
-my $branchfilter = ($displayby ne "branchcode") ? $input->param('branchcode') : '';
my $tabcode = $input->param('tabcode');
# filter informations which are not suggestion related.
my $reasonsloop = GetAuthorisedValues("SUGGEST");
foreach my $criteriumvalue ( @criteria_dv ) {
# By default, display suggestions from current working branch
- if(not defined $branchfilter) {
+ unless ( exists $$suggestion_ref{'branchcode'} ) {
$$suggestion_ref{'branchcode'} = C4::Context->userenv->{'branch'};
}
my $definedvalue = defined $$suggestion_ref{$displayby} && $$suggestion_ref{$displayby} ne "";
## Initializing selection lists
#branch display management
-my $onlymine=C4::Context->preference('IndependantBranches') &&
+my $branchfilter = ($displayby ne "branchcode") ? $input->param('branchcode') : '';
+my $onlymine=C4::Context->preference('IndependentBranches') &&
C4::Context->userenv &&
C4::Context->userenv->{flags}!=1 &&
C4::Context->userenv->{branch};
$hashlists{ lc($field) . "_loop" } = \@codes_list;
}
$template->param(%hashlists);
+$template->param(
+ SuggestionStatuses => GetAuthorisedValues('SUGGEST_STATUS'),
+);
output_html_with_http_headers $input, $cookie, $template->output;