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

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

Return to bug 30577