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 1072-1077 Link Here
1072
    [% Asset.js("lib/hc-sticky.js") | $raw %]
1072
    [% Asset.js("lib/hc-sticky.js") | $raw %]
1073
    [% Asset.js("js/circ-patron-search-results.js") | $raw %]
1073
    [% Asset.js("js/circ-patron-search-results.js") | $raw %]
1074
    [% INCLUDE 'select2.inc' %]
1074
    [% INCLUDE 'select2.inc' %]
1075
    [% Asset.js("js/holds.js") | $raw%]
1075
    <script>
1076
    <script>
1076
        var Sticky;
1077
        var Sticky;
1077
        var biblionumber = "[% biblionumber | $raw %]";
1078
        var biblionumber = "[% biblionumber | $raw %]";
Lines 1231-1252 Link Here
1231
                });
1232
                });
1232
            [% END %]
1233
            [% END %]
1233
1234
1234
            function display_pickup_location (state) {
1235
                var $text;
1236
                if ( state.needs_override === true ) {
1237
                    $text = $(
1238
                        '<span>' + state.text + '</span> <span style="float:right;" title="' +
1239
                        _("This pickup location is not allowed according to circulation rules") +
1240
                        '"><i class="fa fa-exclamation-circle" aria-hidden="true"></i></span>'
1241
                    );
1242
                }
1243
                else {
1244
                    $text = $('<span>'+state.text+'</span>');
1245
                }
1246
1247
                return $text;
1248
            };
1249
1250
            $(".pickup_location_dropdown").each( function () {
1235
            $(".pickup_location_dropdown").each( function () {
1251
                var this_dropdown = $(this);
1236
                var this_dropdown = $(this);
1252
                var hold_id = $(this).data('hold_id');
1237
                var hold_id = $(this).data('hold_id');
Lines 1262-1274 Link Here
1262
                            var query = {
1247
                            var query = {
1263
                                "q": JSON.stringify({"name":{"-like":'%'+search_term+'%'}}),
1248
                                "q": JSON.stringify({"name":{"-like":'%'+search_term+'%'}}),
1264
                                "_order_by": "name",
1249
                                "_order_by": "name",
1265
                                "_per_page": -1
1250
                                "_page": params.page
1266
                            };
1251
                            };
1252
1267
                            return query;
1253
                            return query;
1268
                        },
1254
                        },
1269
                        processResults: function (data) {
1255
                        processResults: function (data, params) {
1270
                            var results = [];
1256
                            var results = [];
1271
                            data.forEach( function ( pickup_location ) {
1257
                            data.results.forEach( function ( pickup_location ) {
1272
                                results.push(
1258
                                results.push(
1273
                                    {
1259
                                    {
1274
                                        "id": pickup_location.library_id.escapeHtml(),
1260
                                        "id": pickup_location.library_id.escapeHtml(),
Lines 1277-1284 Link Here
1277
                                    }
1263
                                    }
1278
                                );
1264
                                );
1279
                            });
1265
                            });
1280
                            return { "results": results };
1266
                            return { "results": results, "pagination": { "more": data.pagination.more } };
1281
                        }
1267
                        },
1268
                        transport: kohaSelect2Transport
1282
                    },
1269
                    },
1283
                    templateResult: display_pickup_location
1270
                    templateResult: display_pickup_location
1284
                });
1271
                });
Lines 1325-1337 Link Here
1325
                                "q": JSON.stringify({"name":{"-like":'%'+search_term+'%'}}),
1312
                                "q": JSON.stringify({"name":{"-like":'%'+search_term+'%'}}),
1326
                                "_order_by": "name",
1313
                                "_order_by": "name",
1327
                                "patron_id": patron_id,
1314
                                "patron_id": patron_id,
1328
                                "_per_page": -1
1315
                                "_page": params.page
1329
                            };
1316
                            };
1330
                            return query;
1317
                            return query;
1331
                        },
1318
                        },
1332
                        processResults: function (data) {
1319
                        processResults: function (data) {
1333
                            var results = [];
1320
                            var results = [];
1334
                            data.forEach( function ( pickup_location ) {
1321
                            data.results.forEach( function ( pickup_location ) {
1335
                                results.push(
1322
                                results.push(
1336
                                    {
1323
                                    {
1337
                                        "id": pickup_location.library_id.escapeHtml(),
1324
                                        "id": pickup_location.library_id.escapeHtml(),
Lines 1340-1347 Link Here
1340
                                    }
1327
                                    }
1341
                                );
1328
                                );
1342
                            });
1329
                            });
1343
                            return { "results": results };
1330
                            return { "results": results, "pagination": { "more": data.pagination.more } };
1344
                        }
1331
                        },
1332
                        transport: kohaSelect2Transport,
1345
                    },
1333
                    },
1346
                    templateResult: display_pickup_location
1334
                    templateResult: display_pickup_location
1347
                });
1335
                });
Lines 1363-1375 Link Here
1363
                                "q": JSON.stringify({"name":{"-like":'%'+search_term+'%'}}),
1351
                                "q": JSON.stringify({"name":{"-like":'%'+search_term+'%'}}),
1364
                                "_order_by": "name",
1352
                                "_order_by": "name",
1365
                                "patron_id": patron_id,
1353
                                "patron_id": patron_id,
1366
                                "_per_page": -1
1354
                                "_page": params.page
1367
                            };
1355
                            };
1368
                            return query;
1356
                            return query;
1369
                        },
1357
                        },
1370
                        processResults: function (data) {
1358
                        processResults: function (data) {
1371
                            var results = [];
1359
                            var results = [];
1372
                            data.forEach( function ( pickup_location ) {
1360
                            data.results.forEach( function ( pickup_location ) {
1373
                                results.push(
1361
                                results.push(
1374
                                    {
1362
                                    {
1375
                                        "id": pickup_location.library_id.escapeHtml(),
1363
                                        "id": pickup_location.library_id.escapeHtml(),
Lines 1378-1385 Link Here
1378
                                    }
1366
                                    }
1379
                                );
1367
                                );
1380
                            });
1368
                            });
1381
                            return { "results": results };
1369
                            return { "results": results, "pagination": { "more": data.pagination.more } };
1382
                        }
1370
                        },
1371
                        transport: kohaSelect2Transport
1383
                    },
1372
                    },
1384
                    templateResult: display_pickup_location
1373
                    templateResult: display_pickup_location
1385
                });
1374
                });
(-)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