View | Details | Raw Unified | Return to bug 12257
Collapse All | Expand All

(-)a/suggestion/suggestion.pl (-10 / +20 lines)
Lines 57-84 sub Init{ Link Here
57
    $suggestion->{'branchcode'}=C4::Context->userenv->{"branch"} unless ($suggestion->{'branchcode'});
57
    $suggestion->{'branchcode'}=C4::Context->userenv->{"branch"} unless ($suggestion->{'branchcode'});
58
}
58
}
59
59
60
sub GetCriteriumDesc{
60
sub GetCriteriumDesc {
61
    my ($criteriumvalue,$displayby)=@_;
61
    my ( $criteriumvalue, $displayby ) = @_;
62
62
63
    if ($displayby =~/suggestedby/||$displayby =~/managedby/||$displayby =~/acceptedby/){
63
    if (   $displayby =~ /suggestedby/
64
        my $borr=C4::Members::GetMember(borrowernumber=>$criteriumvalue);
64
        || $displayby =~ /managedby/
65
        || $displayby =~ /acceptedby/ )
66
    {
67
        my $borr = C4::Members::GetMember( borrowernumber => $criteriumvalue );
65
        return "" unless $borr;
68
        return "" unless $borr;
66
        return $$borr{surname} . ", " . $$borr{firstname};
69
        return $$borr{surname} . ", " . $$borr{firstname};
67
    }
70
    }
68
71
69
    if ( $displayby =~ /budgetid/) {
72
    if ( $displayby =~ /budgetid/ ) {
70
        my $budget = GetBudget($criteriumvalue);
73
        my $budget = GetBudget($criteriumvalue);
71
        return "" unless $budget;
74
        return "" unless $budget;
72
        return $$budget{budget_name};
75
        return $$budget{budget_name};
73
    }
76
    }
74
77
75
    unless ( grep { /$criteriumvalue/ } qw(ASKED ACCEPTED REJECTED CHECKED) ) {
78
    unless ( grep { /$criteriumvalue/ } qw(ASKED ACCEPTED REJECTED CHECKED) ) {
76
        return GetAuthorisedValueByCode('SUGGEST_STATUS', $criteriumvalue ) || "Unknown";
79
        return GetAuthorisedValueByCode( 'SUGGEST_STATUS', $criteriumvalue )
80
          || "Unknown";
81
    }
82
83
    if ( $displayby =~ /status/i ) {
84
        return (
85
            $criteriumvalue eq 'ASKED'
86
            ? "Pending"
87
            : ucfirst( lc($criteriumvalue) )
88
        );
77
    }
89
    }
78
90
79
    return ($criteriumvalue eq 'ASKED'?"Pending":ucfirst(lc( $criteriumvalue))) if ($displayby =~/status/i);
91
    return ( GetBranchName($criteriumvalue) ) if ( $displayby =~ /branchcode/ );
80
    return (GetBranchName($criteriumvalue)) if ($displayby =~/branchcode/);
92
    return ( GetSupportName($criteriumvalue) ) if ( $displayby =~ /itemtype/ );
81
    return (GetSupportName($criteriumvalue)) if ($displayby =~/itemtype/);
82
}
93
}
83
94
84
my $input           = CGI->new;
95
my $input           = CGI->new;
85
- 

Return to bug 12257