View | Details | Raw Unified | Return to bug 28633
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', \'IF(preferred_name != "" AND preferred_name IS NOT NULL, preferred_name, firstname)' ],
79
        prefetch => 'branchcode',
79
        prefetch => 'branchcode',
80
    },
80
    },
81
);
81
);
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc (-4 / +3 lines)
Lines 440-446 Link Here
440
                            }
440
                            }
441
                            [% CASE 'name-address' %]
441
                            [% CASE 'name-address' %]
442
                            {
442
                            {
443
                                "data": "me.surname:me.firstname:me.othernames:me.street_number:me.address:me.address2:me.city:me.state:me.postal_code:me.country",
443
                                "data": "me.surname:me.preferred_name:me.firstname:me.othernames:me.street_number:me.address:me.address2:me.city:me.state:me.postal_code:me.country",
444
                                "searchable": true,
444
                                "searchable": true,
445
                                "orderable": true,
445
                                "orderable": true,
446
                                "render": function( data, type, row, meta ) {
446
                                "render": function( data, type, row, meta ) {
Lines 465-471 Link Here
465
                            }
465
                            }
466
                            [% CASE 'name-address' %]
466
                            [% CASE 'name-address' %]
467
                            {
467
                            {
468
                                "data": "me.surname:me.firstname:me.othernames:me.street_number:me.address:me.address2:me.city:me.state:me.postal_code:me.country",
468
                                "data": "me.surname:me.preferred_name:me.firstname:me.othernames:me.street_number:me.address:me.address2:me.city:me.state:me.postal_code:me.country",
469
                                "searchable": true,
469
                                "searchable": true,
470
                                "orderable": true,
470
                                "orderable": true,
471
                                "render": function( data, type, row, meta ) {
471
                                "render": function( data, type, row, meta ) {
Lines 490-496 Link Here
490
                            }
490
                            }
491
                            [% CASE 'name' %]
491
                            [% CASE 'name' %]
492
                            {
492
                            {
493
                                "data": "me.surname:me.firstname:me.othernames",
493
                                "data": "me.surname:me.preferred_name:me.firstname:me.othernames",
494
                                "searchable": true,
494
                                "searchable": true,
495
                                "orderable": true,
495
                                "orderable": true,
496
                                "render": function( data, type, row, meta ) {
496
                                "render": function( data, type, row, meta ) {
497
- 

Return to bug 28633