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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt (-5 / +8 lines)
Lines 500-510 Link Here
500
500
501
<h1>Suggestions management</h1>
501
<h1>Suggestions management</h1>
502
502
503
<label for="branchcode">Viewing suggestions for library:</label>
503
[% IF ( displayby != "branchcode" ) %]
504
<select name="branchcode" id="branchcode">
504
    <label for="branchcode">Viewing suggestions for library:</label>
505
    <option value="__ANY__">Any</option>
505
    <select name="branchcode" id="branchcode">
506
    [% PROCESS options_for_libraries libraries => Branches.all( selected => branchfilter || branchcode ) %]
506
        <option value="__ANY__">Any</option>
507
</select>
507
        [% PROCESS options_for_libraries libraries => Branches.all( selected => branchfilter || branchcode ) %]
508
    </select>
509
[% END %]
508
510
509
511
510
[% FOR m IN messages %]
512
[% FOR m IN messages %]
Lines 534-539 Link Here
534
                [% ELSIF (suggestion.suggestiontypelabel == "Available") %]Available
536
                [% ELSIF (suggestion.suggestiontypelabel == "Available") %]Available
535
                [% ELSIF (suggestion.suggestiontypelabel == "Ordered") %]Ordered
537
                [% ELSIF (suggestion.suggestiontypelabel == "Ordered") %]Ordered
536
                [% ELSIF (suggestion.suggestiontypelabel == "Unknown") %]Status unknown
538
                [% ELSIF (suggestion.suggestiontypelabel == "Unknown") %]Status unknown
539
                [% ELSIF (suggestion.suggestiontypelabel == "__ANY__") %]Any
537
                [% ELSE %][% suggestion.suggestiontypelabel | html %][% END %]
540
                [% ELSE %][% suggestion.suggestiontypelabel | html %][% END %]
538
            [% ELSE %]
541
            [% ELSE %]
539
                [% IF ( suggestion.suggestiontype ) %]
542
                [% IF ( suggestion.suggestiontype ) %]
(-)a/suggestion/suggestion.pl (-3 / +3 lines)
Lines 61-68 sub GetCriteriumDesc{ Link Here
61
        }
61
        }
62
        return ($criteriumvalue eq 'ASKED'?"Pending":ucfirst(lc( $criteriumvalue))) if ($displayby =~/status/i);
62
        return ($criteriumvalue eq 'ASKED'?"Pending":ucfirst(lc( $criteriumvalue))) if ($displayby =~/status/i);
63
    }
63
    }
64
    return Koha::Libraries->find($criteriumvalue)->branchname
64
    if ( $displayby =~ /branchcode/ ) {
65
        if $displayby =~ /branchcode/;
65
        return $criteriumvalue ? Koha::Libraries->find($criteriumvalue)->branchname : "__ANY__";
66
    }
66
    if ( $displayby =~ /itemtype/ ) {
67
    if ( $displayby =~ /itemtype/ ) {
67
        my $av = Koha::AuthorisedValues->search({ category => 'SUGGEST_FORMAT', authorised_value => $criteriumvalue });
68
        my $av = Koha::AuthorisedValues->search({ category => 'SUGGEST_FORMAT', authorised_value => $criteriumvalue });
68
        return $av->count ? $av->next->lib : 'Unknown';
69
        return $av->count ? $av->next->lib : 'Unknown';
69
- 

Return to bug 25033