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

(-)a/circ/ysearch.pl (-1 / +1 lines)
Lines 74-80 my $borrowers_rs = Koha::Patrons->search_limited( Link Here
74
        # Get the first 10 results
74
        # Get the first 10 results
75
        page     => 1,
75
        page     => 1,
76
        rows     => 10,
76
        rows     => 10,
77
        order_by => [ 'surname', 'firstname' ],
77
        order_by => [ 'surname', 'preferred_name', 'firstname' ],
78
        prefetch => 'branchcode',
78
        prefetch => 'branchcode',
79
    },
79
    },
80
);
80
);
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-29 / +28 lines)
Lines 595-600 Link Here
595
                                <thead>
595
                                <thead>
596
                                    <tr>
596
                                    <tr>
597
                                        <th>Hold</th>
597
                                        <th>Hold</th>
598
                                        <th>Allowed pickup locations</th>
598
                                        [% IF Koha.Preference('item-level_itypes') %]
599
                                        [% IF Koha.Preference('item-level_itypes') %]
599
                                            <th>Item type</th>
600
                                            <th>Item type</th>
600
                                        [% END %]
601
                                        [% END %]
Lines 610-616 Link Here
610
                                            <th>Vol no.</th>
611
                                            <th>Vol no.</th>
611
                                        [% END %]
612
                                        [% END %]
612
                                        <th>Information</th>
613
                                        <th>Information</th>
613
                                        <th>Allowed pickup locations</th>
614
                                    </tr>
614
                                    </tr>
615
                                </thead>
615
                                </thead>
616
                                <tbody>
616
                                <tbody>
Lines 668-673 Link Here
668
                                                        </span>
668
                                                        </span>
669
                                                    [% END # /IF force_hold_level %]
669
                                                    [% END # /IF force_hold_level %]
670
                                                </td>
670
                                                </td>
671
                                                <td>
672
                                                [% IF (itemloo.pickup_locations_count > 0) %]
673
                                                    <select name="item_pickup_[% itemloo.itemnumber | html %]" class="pickup_locations" style="width:100%;"
674
                                                            data-item-id="[% itemloo.itemnumber | html %]"
675
                                                            data-patron-id="[% patron.borrowernumber | html %]"
676
                                                            data-pickup-location-source="item">
677
                                                    [% IF (itemloo.default_pickup_location) %]
678
                                                        <option value="[% itemloo.default_pickup_location.branchcode | html %]" selected="selected">[% itemloo.default_pickup_location.branchname | html %]</option>
679
                                                    [% END %]
680
                                                    </select>
681
                                                [% END %]
682
                                                </td>
671
                                                [% IF Koha.Preference('item-level_itypes') %]
683
                                                [% IF Koha.Preference('item-level_itypes') %]
672
                                                    <td>
684
                                                    <td>
673
                                                        [% UNLESS ( noItemTypeImages ) %]
685
                                                        [% UNLESS ( noItemTypeImages ) %]
Lines 757-774 Link Here
757
                                                       <span class="nfl">Not for loan ([% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.notforloan', authorised_value => itemloo.notforloan ) | html %])</span>
769
                                                       <span class="nfl">Not for loan ([% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.notforloan', authorised_value => itemloo.notforloan ) | html %])</span>
758
                                                    [% END %]
770
                                                    [% END %]
759
                                                </td>
771
                                                </td>
760
                                                <td>
761
                                                [% IF (itemloo.pickup_locations_count > 0) %]
762
                                                    <select name="item_pickup_[% itemloo.itemnumber | html %]" class="pickup_locations" style="width:100%;"
763
                                                            data-item-id="[% itemloo.itemnumber | html %]"
764
                                                            data-patron-id="[% patron.borrowernumber | html %]"
765
                                                            data-pickup-location-source="item">
766
                                                    [% IF (itemloo.default_pickup_location) %]
767
                                                        <option value="[% itemloo.default_pickup_location.branchcode | html %]" selected="selected">[% itemloo.default_pickup_location.branchname | html %]</option>
768
                                                    [% END %]
769
                                                    </select>
770
                                                [% END %]
771
                                                </td>
772
                                            </tr>
772
                                            </tr>
773
                                        [% END # / UNLESS itemloo.hide %]
773
                                        [% END # / UNLESS itemloo.hide %]
774
                                    [% END # /FOREACH itemloo %]
774
                                    [% END # /FOREACH itemloo %]
Lines 788-800 Link Here
788
                            <table id="requesttitles">
788
                            <table id="requesttitles">
789
                                <tr>
789
                                <tr>
790
                                    <th>&nbsp;</th>
790
                                    <th>&nbsp;</th>
791
                                    <th>Pickup location</th>
791
                                    <th>Title</th>
792
                                    <th>Title</th>
792
                                    [% UNLESS Koha.Preference('item-level_itypes') %]
793
                                    [% UNLESS Koha.Preference('item-level_itypes') %]
793
                                        <th>Item type</th>
794
                                        <th>Item type</th>
794
                                    [% END %]
795
                                    [% END %]
795
                                    <th>Priority</th>
796
                                    <th>Priority</th>
796
                                    <th>Information</th>
797
                                    <th>Information</th>
797
                                    <th>Pickup location</th>
798
                                </tr>
798
                                </tr>
799
                                [% FOREACH biblioloo IN biblioloop %]
799
                                [% FOREACH biblioloo IN biblioloop %]
800
                                    [% IF ( biblioloo.warn ) %]
800
                                    [% IF ( biblioloo.warn ) %]
Lines 807-812 Link Here
807
                                                    <input class="multi_hold_item_checkbox" type="checkbox" checked="checked" title="[% biblioloo.biblionumber | html %]"/>
807
                                                    <input class="multi_hold_item_checkbox" type="checkbox" checked="checked" title="[% biblioloo.biblionumber | html %]"/>
808
                                                </td>
808
                                                </td>
809
                                            [% END %]
809
                                            [% END %]
810
                                        <td>
811
                                            [% UNLESS ( biblioloo.none_avail || biblioloo.noitems ) %]
812
                                                <select name="pickup_[% biblioloo.biblionumber | html %]"
813
                                                        class="multi_pickup_select"
814
                                                        data-biblio-id="[% biblioloo.biblionumber | html %]"
815
                                                        data-patron-id="[% patron.borrowernumber | html %]"
816
                                                        data-pickup-locations='[% biblioloo.pickup_locations_codes.json | $raw %]'>
817
                                                    <option value=""></option>
818
                                                    [% FOREACH pickup_location IN biblioloo.pickup_locations %]
819
                                                        <option value="[% pickup_location.branchcode | html %]">[% pickup_location.branchname | html %]</option>
820
                                                    [% END %]
821
                                                </select>
822
                                            [% END %]
823
                                        </td>
810
                                        <td>
824
                                        <td>
811
                                            <ul>
825
                                            <ul>
812
                                                <li>
826
                                                <li>
Lines 859-878 Link Here
859
                                                [% END %]
873
                                                [% END %]
860
                                            [% END %]
874
                                            [% END %]
861
                                        </td>
875
                                        </td>
862
                                        <td>
863
                                            [% UNLESS ( biblioloo.none_avail || biblioloo.noitems ) %]
864
                                                <select name="pickup_[% biblioloo.biblionumber | html %]"
865
                                                        class="multi_pickup_select"
866
                                                        data-biblio-id="[% biblioloo.biblionumber | html %]"
867
                                                        data-patron-id="[% patron.borrowernumber | html %]"
868
                                                        data-pickup-locations='[% biblioloo.pickup_locations_codes.json | $raw %]'>
869
                                                    <option value=""></option>
870
                                                    [% FOREACH pickup_location IN biblioloo.pickup_locations %]
871
                                                        <option value="[% pickup_location.branchcode | html %]">[% pickup_location.branchname | html %]</option>
872
                                                    [% END %]
873
                                                </select>
874
                                            [% END %]
875
                                        </td>
876
                                    </tr>
876
                                    </tr>
877
                                [% END # /FOREACH biblioloo %]
877
                                [% END # /FOREACH biblioloo %]
878
                            </table> <!-- /#requesttitles -->
878
                            </table> <!-- /#requesttitles -->
879
- 

Return to bug 30577