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 506-516 Link Here
506
506
507
<h1>Suggestions management</h1>
507
<h1>Suggestions management</h1>
508
508
509
<label for="branchcode">Viewing suggestions for library:</label>
509
[% IF ( displayby != "branchcode" ) %]
510
<select name="branchcode" id="branchcode">
510
    <label for="branchcode">Viewing suggestions for library:</label>
511
    <option value="__ANY__">Any</option>
511
    <select name="branchcode" id="branchcode">
512
    [% PROCESS options_for_libraries libraries => Branches.all( selected => branchfilter || branchcode ) %]
512
        <option value="__ANY__">Any</option>
513
</select>
513
        [% PROCESS options_for_libraries libraries => Branches.all( selected => branchfilter || branchcode ) %]
514
    </select>
515
[% END %]
514
516
515
517
516
[% FOR m IN messages %]
518
[% FOR m IN messages %]
Lines 540-545 Link Here
540
                [% ELSIF (suggestion.suggestiontypelabel == "Available") %]Available
542
                [% ELSIF (suggestion.suggestiontypelabel == "Available") %]Available
541
                [% ELSIF (suggestion.suggestiontypelabel == "Ordered") %]Ordered
543
                [% ELSIF (suggestion.suggestiontypelabel == "Ordered") %]Ordered
542
                [% ELSIF (suggestion.suggestiontypelabel == "Unknown") %]Status unknown
544
                [% ELSIF (suggestion.suggestiontypelabel == "Unknown") %]Status unknown
545
                [% ELSIF (suggestion.suggestiontypelabel == "__ANY__") %]Any
543
                [% ELSE %][% suggestion.suggestiontypelabel | html %][% END %]
546
                [% ELSE %][% suggestion.suggestiontypelabel | html %][% END %]
544
            [% ELSE %]
547
            [% ELSE %]
545
                [% IF ( suggestion.suggestiontype ) %]
548
                [% 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