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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-29 / +18 lines)
Lines 1131-1136 Link Here
1131
    [% Asset.js("lib/hc-sticky.js") | $raw %]
1131
    [% Asset.js("lib/hc-sticky.js") | $raw %]
1132
    [% Asset.js("js/circ-patron-search-results.js") | $raw %]
1132
    [% Asset.js("js/circ-patron-search-results.js") | $raw %]
1133
    [% INCLUDE 'select2.inc' %]
1133
    [% INCLUDE 'select2.inc' %]
1134
    [% Asset.js("js/holds.js") | $raw%]
1134
    <script>
1135
    <script>
1135
        var Sticky;
1136
        var Sticky;
1136
        var biblionumber = "[% biblionumber | $raw %]";
1137
        var biblionumber = "[% biblionumber | $raw %]";
Lines 1290-1311 Link Here
1290
                });
1291
                });
1291
            [% END %]
1292
            [% END %]
1292
1293
1293
            function display_pickup_location (state) {
1294
                var $text;
1295
                if ( state.needs_override === true ) {
1296
                    $text = $(
1297
                        '<span>' + state.text + '</span> <span style="float:right;" title="' +
1298
                        _("This pickup location is not allowed according to circulation rules") +
1299
                        '"><i class="fa fa-exclamation-circle" aria-hidden="true"></i></span>'
1300
                    );
1301
                }
1302
                else {
1303
                    $text = $('<span>'+state.text+'</span>');
1304
                }
1305
1306
                return $text;
1307
            };
1308
1309
            $(".pickup_location_dropdown").each( function () {
1294
            $(".pickup_location_dropdown").each( function () {
1310
                var this_dropdown = $(this);
1295
                var this_dropdown = $(this);
1311
                var hold_id = $(this).data('hold_id');
1296
                var hold_id = $(this).data('hold_id');
Lines 1321-1333 Link Here
1321
                            var query = {
1306
                            var query = {
1322
                                "q": JSON.stringify({"name":{"-like":'%'+search_term+'%'}}),
1307
                                "q": JSON.stringify({"name":{"-like":'%'+search_term+'%'}}),
1323
                                "_order_by": "name",
1308
                                "_order_by": "name",
1324
                                "_per_page": -1
1309
                                "_page": params.page
1325
                            };
1310
                            };
1311
1326
                            return query;
1312
                            return query;
1327
                        },
1313
                        },
1328
                        processResults: function (data) {
1314
                        processResults: function (data, params) {
1329
                            var results = [];
1315
                            var results = [];
1330
                            data.forEach( function ( pickup_location ) {
1316
                            data.results.forEach( function ( pickup_location ) {
1331
                                results.push(
1317
                                results.push(
1332
                                    {
1318
                                    {
1333
                                        "id": pickup_location.library_id.escapeHtml(),
1319
                                        "id": pickup_location.library_id.escapeHtml(),
Lines 1336-1343 Link Here
1336
                                    }
1322
                                    }
1337
                                );
1323
                                );
1338
                            });
1324
                            });
1339
                            return { "results": results };
1325
                            return { "results": results, "pagination": { "more": data.pagination.more } };
1340
                        }
1326
                        },
1327
                        transport: kohaSelect2Transport
1341
                    },
1328
                    },
1342
                    templateResult: display_pickup_location
1329
                    templateResult: display_pickup_location
1343
                });
1330
                });
Lines 1384-1396 Link Here
1384
                                "q": JSON.stringify({"name":{"-like":'%'+search_term+'%'}}),
1371
                                "q": JSON.stringify({"name":{"-like":'%'+search_term+'%'}}),
1385
                                "_order_by": "name",
1372
                                "_order_by": "name",
1386
                                "patron_id": patron_id,
1373
                                "patron_id": patron_id,
1387
                                "_per_page": -1
1374
                                "_page": params.page
1388
                            };
1375
                            };
1389
                            return query;
1376
                            return query;
1390
                        },
1377
                        },
1391
                        processResults: function (data) {
1378
                        processResults: function (data) {
1392
                            var results = [];
1379
                            var results = [];
1393
                            data.forEach( function ( pickup_location ) {
1380
                            data.results.forEach( function ( pickup_location ) {
1394
                                results.push(
1381
                                results.push(
1395
                                    {
1382
                                    {
1396
                                        "id": pickup_location.library_id.escapeHtml(),
1383
                                        "id": pickup_location.library_id.escapeHtml(),
Lines 1399-1406 Link Here
1399
                                    }
1386
                                    }
1400
                                );
1387
                                );
1401
                            });
1388
                            });
1402
                            return { "results": results };
1389
                            return { "results": results, "pagination": { "more": data.pagination.more } };
1403
                        }
1390
                        },
1391
                        transport: kohaSelect2Transport,
1404
                    },
1392
                    },
1405
                    templateResult: display_pickup_location
1393
                    templateResult: display_pickup_location
1406
                });
1394
                });
Lines 1422-1434 Link Here
1422
                                "q": JSON.stringify({"name":{"-like":'%'+search_term+'%'}}),
1410
                                "q": JSON.stringify({"name":{"-like":'%'+search_term+'%'}}),
1423
                                "_order_by": "name",
1411
                                "_order_by": "name",
1424
                                "patron_id": patron_id,
1412
                                "patron_id": patron_id,
1425
                                "_per_page": -1
1413
                                "_page": params.page
1426
                            };
1414
                            };
1427
                            return query;
1415
                            return query;
1428
                        },
1416
                        },
1429
                        processResults: function (data) {
1417
                        processResults: function (data) {
1430
                            var results = [];
1418
                            var results = [];
1431
                            data.forEach( function ( pickup_location ) {
1419
                            data.results.forEach( function ( pickup_location ) {
1432
                                results.push(
1420
                                results.push(
1433
                                    {
1421
                                    {
1434
                                        "id": pickup_location.library_id.escapeHtml(),
1422
                                        "id": pickup_location.library_id.escapeHtml(),
Lines 1437-1444 Link Here
1437
                                    }
1425
                                    }
1438
                                );
1426
                                );
1439
                            });
1427
                            });
1440
                            return { "results": results };
1428
                            return { "results": results, "pagination": { "more": data.pagination.more } };
1441
                        }
1429
                        },
1430
                        transport: kohaSelect2Transport
1442
                    },
1431
                    },
1443
                    templateResult: display_pickup_location
1432
                    templateResult: display_pickup_location
1444
                });
1433
                });
(-)a/koha-tmpl/intranet-tmpl/prog/js/holds.js (-20 / +21 lines)
Lines 1-3 Link Here
1
function display_pickup_location (state) {
2
    var $text;
3
    if ( state.needs_override === true ) {
4
        $text = $(
5
            '<span>' + state.text + '</span> <span style="float:right;" title="' +
6
            _("This pickup location is not allowed according to circulation rules") +
7
            '"><i class="fa fa-exclamation-circle" aria-hidden="true"></i></span>'
8
        );
9
    }
10
    else {
11
        $text = $('<span>'+state.text+'</span>');
12
    }
13
14
    return $text;
15
};
16
1
/* global __ dataTablesDefaults borrowernumber SuspendHoldsIntranet */
17
/* global __ dataTablesDefaults borrowernumber SuspendHoldsIntranet */
2
$(document).ready(function() {
18
$(document).ready(function() {
3
    var holdsTable;
19
    var holdsTable;
Lines 219-240 $(document).ready(function() { Link Here
219
                    });
235
                    });
220
                });
236
                });
221
237
222
                function display_pickup_location (state) {
223
                    var $text;
224
                    if ( state.needs_override === true ) {
225
                        $text = $(
226
                            '<span>' + state.text + '</span> <span style="float:right;" title="' +
227
                            _("This pickup location is not allowed according to circulation rules") +
228
                            '"><i class="fa fa-exclamation-circle" aria-hidden="true"></i></span>'
229
                        );
230
                    }
231
                    else {
232
                        $text = $('<span>'+state.text+'</span>');
233
                    }
234
235
                    return $text;
236
                };
237
238
                $(".hold_location_select").each( function () {
238
                $(".hold_location_select").each( function () {
239
                    var this_dropdown = $(this);
239
                    var this_dropdown = $(this);
240
                    var hold_id = $(this).data('hold-id');
240
                    var hold_id = $(this).data('hold-id');
Lines 251-263 $(document).ready(function() { Link Here
251
                                var query = {
251
                                var query = {
252
                                    "q": JSON.stringify({"name":{"-like":'%'+search_term+'%'}}),
252
                                    "q": JSON.stringify({"name":{"-like":'%'+search_term+'%'}}),
253
                                    "_order_by": "name",
253
                                    "_order_by": "name",
254
                                    "_per_page": -1
254
                                    "_page": params.page
255
                                };
255
                                };
256
                                return query;
256
                                return query;
257
                            },
257
                            },
258
                            processResults: function (data) {
258
                            processResults: function (data) {
259
                                var results = [];
259
                                var results = [];
260
                                data.forEach( function ( pickup_location ) {
260
                                data.results.forEach( function ( pickup_location ) {
261
                                    results.push(
261
                                    results.push(
262
                                        {
262
                                        {
263
                                            "id": pickup_location.library_id.escapeHtml(),
263
                                            "id": pickup_location.library_id.escapeHtml(),
Lines 266-273 $(document).ready(function() { Link Here
266
                                        }
266
                                        }
267
                                    );
267
                                    );
268
                                });
268
                                });
269
                                return { "results": results };
269
                                return { "results": results, "pagination": { "more": data.pagination.more } };
270
                            }
270
                            },
271
                            transport: kohaSelect2Transport
271
                        },
272
                        },
272
                        templateResult: display_pickup_location
273
                        templateResult: display_pickup_location
273
                    });
274
                    });
(-)a/koha-tmpl/intranet-tmpl/prog/js/select2.js (-1 / +20 lines)
Lines 37-39 $(document).ready(function(){ Link Here
37
        });
37
        });
38
    });
38
    });
39
});
39
});
40
- 
40
41
function kohaSelect2Transport(params, success, failure) {
42
    var read_headers = function (data, textStatus, jqXHR) {
43
        var more = false;
44
        var link = jqXHR.getResponseHeader('Link') || '';
45
        if (link.search(/<([^>]+)>;\s*rel\s*=\s*['"]?next['"]?\s*(,|$)/i) > -1) {
46
            more = true;
47
        }
48
49
        return {
50
            results: data,
51
            pagination: {
52
                more: more
53
            }
54
        };
55
    };
56
    var $request = $.ajax(params);
57
    $request.then(read_headers).then(success);
58
    $request.fail(failure);
59
}

Return to bug 29404