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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table.inc (+4 lines)
Lines 1-4 Link Here
1
[% IF patron.borrowernumber %]
2
<table id="ill-requests-patron-[% patron.borrowernumber | html %]">
3
[% ELSE %]
1
<table id="ill-requests">
4
<table id="ill-requests">
5
[% END %]
2
    <thead>
6
    <thead>
3
        <tr id="ill_requests_header">
7
        <tr id="ill_requests_header">
4
            <th scope="col">Request ID</th>
8
            <th scope="col">Request ID</th>
(-)a/koha-tmpl/intranet-tmpl/prog/js/ill-list-table.js (-14 / +22 lines)
Lines 55-71 $(document).ready(function() { Link Here
55
    // see ill/ill-requests.pl and members/ill-requests.pl
55
    // see ill/ill-requests.pl and members/ill-requests.pl
56
    let additional_prefilters = [];
56
    let additional_prefilters = [];
57
    if(prefilters){
57
    if(prefilters){
58
            let prefilters_array = prefilters.split("&");
58
        let prefilters_array = prefilters.split("&");
59
            prefilters_array.forEach((prefilter) => {
59
        prefilters_array.forEach((prefilter) => {
60
                let prefilter_split = prefilter.split("=");
60
            let prefilter_split = prefilter.split("=");
61
                additional_prefilters.push( {
61
            additional_prefilters.push( {
62
                     "key": prefilter_split[0],
62
                    "key": prefilter_split[0],
63
                     "value": prefilter_split[1]
63
                    "value": prefilter_split[1]
64
                } );
64
            } );
65
65
        });
66
            });
67
    }
66
    }
68
67
68
    let borrower_prefilter = get_prefilter_value('borrowernumber');
69
69
    let additional_filters = {
70
    let additional_filters = {
70
        "me.backend": function(){
71
        "me.backend": function(){
71
            let backend = $("#illfilter_backend").val();
72
            let backend = $("#illfilter_backend").val();
Lines 78-86 $(document).ready(function() { Link Here
78
            return { "=": branchcode }
79
            return { "=": branchcode }
79
        },
80
        },
80
        "me.borrowernumber": function(){
81
        "me.borrowernumber": function(){
81
            let borrowernumber_pre_filter = additional_prefilters.find(e => e.key === 'borrowernumber');
82
            return borrower_prefilter ? { "=": borrower_prefilter } : "";
82
            if ( additional_prefilters.length == 0 || typeof borrowernumber_pre_filter === undefined) return "";
83
            return { "=": borrowernumber_pre_filter["value"] }
84
        },
83
        },
85
        "-or": function(){
84
        "-or": function(){
86
            let patron = $("#illfilter_patron").val();
85
            let patron = $("#illfilter_patron").val();
Lines 178-184 $(document).ready(function() { Link Here
178
        }
177
        }
179
    };
178
    };
180
179
181
    var ill_requests_table = $("#ill-requests").kohaTable({
180
    let table_id = "#ill-requests";
181
    if (borrower_prefilter) {
182
        table_id += "-patron-" + borrower_prefilter;
183
    }
184
185
    var ill_requests_table = $(table_id).kohaTable({
182
        "ajax": {
186
        "ajax": {
183
            "url": '/api/v1/ill/requests'
187
            "url": '/api/v1/ill/requests'
184
        },
188
        },
Lines 494-497 $(document).ready(function() { Link Here
494
        clearSearch();
498
        clearSearch();
495
    });
499
    });
496
500
501
    function get_prefilter_value(prefilter_key) {
502
        let pre_filter = additional_prefilters.find(e => e.key === prefilter_key);
503
        return additional_prefilters.length != 0 && typeof pre_filter !== "undefined" ? pre_filter['value'] : null;
504
    }
505
497
});
506
});
498
- 

Return to bug 33786