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

(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (-3 / +3 lines)
Lines 2161-2167 li { Link Here
2161
    }
2161
    }
2162
}
2162
}
2163
2163
2164
#searchresults {
2164
#searchresults,
2165
#table_borrowers {
2165
    .address {
2166
    .address {
2166
        ul {
2167
        ul {
2167
            margin: 0;
2168
            margin: 0;
Lines 4031-4038 input.renew { Link Here
4031
}
4032
}
4032
4033
4033
#pat_member {
4034
#pat_member {
4034
    #patron_list_dialog,
4035
    #patron_list_dialog {
4035
    #searchresults {
4036
        display: none;
4036
        display: none;
4037
    }
4037
    }
4038
}
4038
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc (+25 lines)
Lines 421-426 Link Here
421
                                    return r;
421
                                    return r;
422
                                }
422
                                }
423
                            }
423
                            }
424
                            [% CASE 'name-address' %]
425
                            {
426
                                "data": "me.firstname:me.surname:me.othernames:me.street_number:me.address:me.address2:me.city:me.state:me.postal_code:me.country",
427
                                "searchable": true,
428
                                "orderable": true,
429
                                "render": function( data, type, row, meta ) {
430
                                    let patron_id = encodeURIComponent(row.patron_id);
431
                                    let r = '';
432
                                    [% IF ! open_on_row_click %]
433
                                    r += "<a href=\"/cgi-bin/koha/members/moremember.pl?borrowernumber=" + patron_id + "\" class=\"patron_name\" data-borrowernumber=\"" + patron_id + "\" style=\"white-space:nowrap\">" + $patron_to_html(row, { invert_name: 1 }) + "</a>";
434
                                    [% ELSE %]
435
                                    r += $patron_to_html(row, { invert_name: 1 });
436
                                    [% END %]
437
                                    r += '<br/>';
438
                                    r += '<div class="address"><ul>';
439
                                    r += $format_address(row, { no_line_break: 1 });
440
441
                                    if ( row.email ) {
442
                                        r += "<li>" + _("Email: ") + "<a href='mailto:" + encodeURIComponent(row.email) + "'>" + escape_str(row.email) + "</a></li>";
443
                                    }
444
                                    r += '</ul></div>'
445
446
                                    return r;
447
                                }
448
                            }
424
                            [% CASE 'name' %]
449
                            [% CASE 'name' %]
425
                            {
450
                            {
426
                                "data": "me.firstname:me.surname:me.othernames",
451
                                "data": "me.firstname:me.surname:me.othernames",
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt (-3 / +4 lines)
Lines 8-14 Link Here
8
[% PROCESS 'patronfields.inc' %]
8
[% PROCESS 'patronfields.inc' %]
9
[% SET libraries = Branches.all %]
9
[% SET libraries = Branches.all %]
10
[% SET categories = Categories.all.unblessed %]
10
[% SET categories = Categories.all.unblessed %]
11
[% SET columns = ['cardnumber', 'name', 'dateofbirth', 'branch', 'category', 'dateexpiry', 'checkouts', 'account_balance', 'borrowernotes', 'action'] %]
11
[% SET columns = ['cardnumber', 'name-address', 'dateofbirth', 'branch', 'category', 'dateexpiry', 'checkouts', 'account_balance', 'borrowernotes', 'action'] %]
12
[% PROCESS 'patron-search.inc' %]
12
[% PROCESS 'patron-search.inc' %]
13
[% INCLUDE 'doc-head-open.inc' %]
13
[% INCLUDE 'doc-head-open.inc' %]
14
<title>Patrons[% IF ( searching ) %] &rsaquo; Search results[% END %] &rsaquo; Koha</title>
14
<title>Patrons[% IF ( searching ) %] &rsaquo; Search results[% END %] &rsaquo; Koha</title>
Lines 64-70 Link Here
64
            </div>
64
            </div>
65
          [% END %]
65
          [% END %]
66
66
67
          <div id="patron_search_results">
67
          <div id="searchresults">
68
            [% IF CAN_user_tools_manage_patron_lists || CAN_user_borrowers_edit_borrowers %]
68
            [% IF CAN_user_tools_manage_patron_lists || CAN_user_borrowers_edit_borrowers %]
69
              <div class="searchheader fh-fixedHeader" id="searchheader" style="display:none;">
69
              <div class="searchheader fh-fixedHeader" id="searchheader" style="display:none;">
70
                  <div>
70
                  <div>
Lines 310-316 Link Here
310
        redirect_if_one_result => 1,
310
        redirect_if_one_result => 1,
311
        redirect_url           => redirect_url,
311
        redirect_url           => redirect_url,
312
        sticky_header => "searchheader",
312
        sticky_header => "searchheader",
313
        sticky_to     => "patron_search_results",
313
        sticky_to     => "searchresults",
314
        default_sort_column => 'name-address',
314
    %]
315
    %]
315
316
316
317
(-)a/koha-tmpl/intranet-tmpl/prog/js/members.js (-2 / +1 lines)
Lines 197-203 $(document).ready(function(){ Link Here
197
197
198
    $('body').on('click', '#guarantor_search', function(e) {
198
    $('body').on('click', '#guarantor_search', function(e) {
199
        e.preventDefault();
199
        e.preventDefault();
200
        var newin = window.open('/cgi-bin/koha/members/search.pl?columns=cardnumber,name,category,branch,dateofbirth,address,action','popup','width=1024,height=768,resizable=no,toolbar=false,scrollbars=yes,top');
200
        var newin = window.open('/cgi-bin/koha/members/search.pl?columns=cardnumber,name,category,branch,dateofbirth,address-library,action','popup','width=1024,height=768,resizable=no,toolbar=false,scrollbars=yes,top');
201
    });
201
    });
202
202
203
    $('#guarantor_relationships').on('click', '.guarantor_cancel', function(e) {
203
    $('#guarantor_relationships').on('click', '.guarantor_cancel', function(e) {
204
- 

Return to bug 30063