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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt (-1 / +1 lines)
Lines 281-287 Link Here
281
        }
281
        }
282
282
283
        $(document).ready(function() {
283
        $(document).ready(function() {
284
            columns_settings = [% TablesSettings.GetColumns( 'admin', 'currency', 'currencies-table', 'json' ) | $raw %]
284
            columns_settings = [% TablesSettings.GetTableSettings( 'admin', 'currency', 'currencies-table', 'json' ) | $raw %]
285
            var issuest = KohaTable("currencies-table", {
285
            var issuest = KohaTable("currencies-table", {
286
                dom: 'B<"clearfix">t',
286
                dom: 'B<"clearfix">t',
287
            }, columns_settings );
287
            }, columns_settings );
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt (-2 / +2 lines)
Lines 312-321 Link Here
312
                $("#dataPreview .modal-body").html("<div id=\"loading\"><img src=\"[% interface | html %]/[% theme | html %]/img/spinner-small.gif\" alt=\"\" /> "+_("Loading")+"</div>");
312
                $("#dataPreview .modal-body").html("<div id=\"loading\"><img src=\"[% interface | html %]/[% theme | html %]/img/spinner-small.gif\" alt=\"\" /> "+_("Loading")+"</div>");
313
            });
313
            });
314
314
315
            columns_settings = [% TablesSettings.GetColumns( 'cataloguing', 'addbooks', 'reservoir-table', 'json' ) | $raw %]
315
            var table_settings = [% TablesSettings.GetTableSettings( 'cataloguing', 'addbooks', 'reservoir-table', 'json' ) | $raw %]
316
            var reservoirt = KohaTable("reservoir-table", {
316
            var reservoirt = KohaTable("reservoir-table", {
317
                "pagingType": "simple"
317
                "pagingType": "simple"
318
            }, columns_settings );
318
            }, table_settings );
319
        });
319
        });
320
320
321
        /* this function open a popup to search on z3950 server.  */
321
        /* this function open a popup to search on z3950 server.  */
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-2 / +2 lines)
Lines 1037-1044 Link Here
1037
    [% Asset.js("js/holds.js") | $raw %]
1037
    [% Asset.js("js/holds.js") | $raw %]
1038
    [% INCLUDE 'calendar.inc' %]
1038
    [% INCLUDE 'calendar.inc' %]
1039
    <script>
1039
    <script>
1040
        columns_settings_issues_table = [% TablesSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) | $raw %]
1040
        table_settings_issues_table = [% TablesSettings.GetTableSettings( 'circ', 'circulation', 'issues-table', 'json' ) | $raw %]
1041
        columns_settings_borrowers_table = [% TablesSettings.GetColumns( 'circ', 'circulation', 'table_borrowers', 'json' ) | $raw %]
1041
        table_settings_borrowers_table = [% TablesSettings.GetTableSettings( 'circ', 'circulation', 'table_borrowers', 'json' ) | $raw %]
1042
1042
1043
        [% IF borrowernumber and patron %]
1043
        [% IF borrowernumber and patron %]
1044
            if( Cookies.get("holdfor") != [% patron.borrowernumber | html %]){
1044
            if( Cookies.get("holdfor") != [% patron.borrowernumber | html %]){
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt (-4 / +4 lines)
Lines 178-197 Link Here
178
    [% INCLUDE 'columns_settings.inc' %]
178
    [% INCLUDE 'columns_settings.inc' %]
179
    <script>
179
    <script>
180
        var MSG_CANCEL_SELECTED = _("Cancel selected (%s)");
180
        var MSG_CANCEL_SELECTED = _("Cancel selected (%s)");
181
        var holdst_columns_settings = [% TablesSettings.GetColumns( 'circ', 'holds_awaiting_pickup', 'holdst', 'json' ) | $raw %];
181
        var holdst_table_settings = [% TablesSettings.GetTableSettings( 'circ', 'holds_awaiting_pickup', 'holdst', 'json' ) | $raw %];
182
        var holdso_columns_settings = [% TablesSettings.GetColumns( 'circ', 'holds_awaiting_pickup', 'holdso', 'json' ) | $raw %];
182
        var holdso_table_settings = [% TablesSettings.GetTableSettings( 'circ', 'holds_awaiting_pickup', 'holdso', 'json' ) | $raw %];
183
183
184
        $(document).ready(function() {
184
        $(document).ready(function() {
185
185
186
            KohaTable("holdst", {
186
            KohaTable("holdst", {
187
                "sPaginationType": "full",
187
                "sPaginationType": "full",
188
                "order": [[1, 'asc']]
188
                "order": [[1, 'asc']]
189
            }, holdst_columns_settings);
189
            }, holdst_table_settings);
190
190
191
            KohaTable("holdso", {
191
            KohaTable("holdso", {
192
                "sPaginationType": "full",
192
                "sPaginationType": "full",
193
                "order": [[1, 'asc']]
193
                "order": [[1, 'asc']]
194
            }, holdso_columns_settings);
194
            }, holdso_table_settings);
195
195
196
            $('#resultlist').tabs();
196
            $('#resultlist').tabs();
197
197
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt (-3 / +3 lines)
Lines 210-218 Link Here
210
    [% INCLUDE 'datatables.inc' %]
210
    [% INCLUDE 'datatables.inc' %]
211
    [% INCLUDE 'columns_settings.inc' %]
211
    [% INCLUDE 'columns_settings.inc' %]
212
    <script>
212
    <script>
213
        var checkouts_columns = [% TablesSettings.GetColumns( 'circ', 'print_summary', 'print-summary-checkouts', 'json' ) | $raw %];
213
        var checkouts_columns = [% TablesSettings.GetTableSettings( 'circ', 'print_summary', 'print-summary-checkouts', 'json' ) | $raw %];
214
        var holds_columns = [% TablesSettings.GetColumns( 'circ', 'print_summary', 'print-summary-holds', 'json' ) | $raw %];
214
        var holds_columns = [% TablesSettings.GetTableSettings( 'circ', 'print_summary', 'print-summary-holds', 'json' ) | $raw %];
215
        var fines_columns = [% TablesSettings.GetColumns( 'circ', 'print_summary', 'print-summary-fines', 'json' ) | $raw %];
215
        var fines_columns = [% TablesSettings.GetTableSettings( 'circ', 'print_summary', 'print-summary-fines', 'json' ) | $raw %];
216
216
217
        function moveColumnsButton( tableId ){
217
        function moveColumnsButton( tableId ){
218
            /* Hide the export button */
218
            /* Hide the export button */
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-1 / +1 lines)
Lines 914-920 Link Here
914
    [% Asset.js("js/recalls.js") | $raw %]
914
    [% Asset.js("js/recalls.js") | $raw %]
915
    <script>
915
    <script>
916
916
917
        columns_settings_issues_table = [% TablesSettings.GetColumns( 'members', 'moremember', 'issues-table', 'json' ) | $raw %]
917
        table_settings_issues_table = [% TablesSettings.GetTableSettings( 'members', 'moremember', 'issues-table', 'json' ) | $raw %]
918
918
919
        $(document).ready(function() {
919
        $(document).ready(function() {
920
            $("#info_digests").tooltip();
920
            $("#info_digests").tooltip();
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt (-2 / +2 lines)
Lines 354-365 Link Here
354
                sale_table.DataTable().row($(this).parents('tr')).remove().draw(false);
354
                sale_table.DataTable().row($(this).parents('tr')).remove().draw(false);
355
        });
355
        });
356
356
357
        var items_columns_settings = [% TablesSettings.GetColumns('pos', 'pay', 'invoices', 'json') | $raw %];
357
        var items_table_settings = [% TablesSettings.GetTableSettings('pos', 'pay', 'invoices', 'json') | $raw %];
358
        var items_table = KohaTable("invoices", {
358
        var items_table = KohaTable("invoices", {
359
               "sPaginationType": "full",
359
               "sPaginationType": "full",
360
               "aaSorting": [[ 0, "asc" ]],
360
               "aaSorting": [[ 0, "asc" ]],
361
               "autoWidth": false
361
               "autoWidth": false
362
        }, items_columns_settings, false);
362
        }, items_table_settings, false);
363
363
364
        $("#invoices").on("click", ".add_button", function(e) {
364
        $("#invoices").on("click", ".add_button", function(e) {
365
            e.preventDefault();
365
            e.preventDefault();
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-2 / +2 lines)
Lines 1189-1195 Link Here
1189
        }
1189
        }
1190
1190
1191
        var MSG_CANCEL_SELECTED = _("Cancel selected (%s)");
1191
        var MSG_CANCEL_SELECTED = _("Cancel selected (%s)");
1192
        columns_settings_borrowers_table = [% TablesSettings.GetColumns( 'circ', 'circulation', 'table_borrowers', 'json' ) | $raw %];
1192
        table_settings_borrowers_table = [% TablesSettings.GetTableSettings( 'circ', 'circulation', 'table_borrowers', 'json' ) | $raw %];
1193
        $.fn.select2.defaults.set("width", "100%" );
1193
        $.fn.select2.defaults.set("width", "100%" );
1194
        $.fn.select2.defaults.set("dropdownAutoWidth", true );
1194
        $.fn.select2.defaults.set("dropdownAutoWidth", true );
1195
1195
Lines 1632-1638 Link Here
1632
                'bAutoWidth': false,
1632
                'bAutoWidth': false,
1633
                'sPaginationType': 'full_numbers',
1633
                'sPaginationType': 'full_numbers',
1634
                "bProcessing": true
1634
                "bProcessing": true
1635
            }, columns_settings_borrowers_table );
1635
            }, table_settings_borrowers_table);
1636
            $("#table_borrowers_wrapper").hide();
1636
            $("#table_borrowers_wrapper").hide();
1637
1637
1638
            function filter() {
1638
            function filter() {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt (-2 / +2 lines)
Lines 1305-1317 Link Here
1305
            $(document).ready(function() {
1305
            $(document).ready(function() {
1306
                $('#suggestiontabs').tabs();
1306
                $('#suggestiontabs').tabs();
1307
1307
1308
                columns_settings = [% TablesSettings.GetColumns( 'acqui', 'suggestions', 'suggestions', 'json' ) | $raw %]
1308
                table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'suggestions', 'suggestions', 'json' ) | $raw %]
1309
                [% FOREACH suggestion IN suggestions %]
1309
                [% FOREACH suggestion IN suggestions %]
1310
                    [% IF ( suggestion.suggestions_loop ) %]
1310
                    [% IF ( suggestion.suggestions_loop ) %]
1311
                        KohaTable("table_[% loop.count| html %]", {
1311
                        KohaTable("table_[% loop.count| html %]", {
1312
                            "sorting": [[ 3, "asc" ]],
1312
                            "sorting": [[ 3, "asc" ]],
1313
                            "autoWidth": false,
1313
                            "autoWidth": false,
1314
                        }, columns_settings );
1314
                        }, table_settings );
1315
                    [% END %]
1315
                    [% END %]
1316
                [% END %]
1316
                [% END %]
1317
1317
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt (-1 / +1 lines)
Lines 358-364 Link Here
358
    [% INCLUDE 'datatables.inc' %]
358
    [% INCLUDE 'datatables.inc' %]
359
    [% INCLUDE 'columns_settings.inc' %]
359
    [% INCLUDE 'columns_settings.inc' %]
360
    <script>
360
    <script>
361
        columns_settings = [% TablesSettings.GetColumns('tools', 'marc-modification-templates', 'templatest', 'json') | $raw %];
361
        table_settings = [% TablesSettings.GetTableSettings('tools', 'marc-modification-templates', 'templatest', 'json') | $raw %];
362
        [% IF ActionsLoop %]
362
        [% IF ActionsLoop %]
363
            var mmtas = [% ActionsLoop.json | $raw %]
363
            var mmtas = [% ActionsLoop.json | $raw %]
364
        [% END %]
364
        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt (-1 / +1 lines)
Lines 413-419 Link Here
413
    <script>
413
    <script>
414
        var patron_attributes_lib = new Array();
414
        var patron_attributes_lib = new Array();
415
        var patron_attributes_values = new Array();
415
        var patron_attributes_values = new Array();
416
        var table_settings = [% TablesSettings.GetColumns( 'tools', 'batch_patron_modification', 'borrowerst', 'json' ) | $raw %];
416
        var table_settings = [% TablesSettings.GetTableSettings( 'tools', 'batch_patron_modification', 'borrowerst', 'json' ) | $raw %];
417
        [% FOREACH attrh IN attributes_header %]
417
        [% FOREACH attrh IN attributes_header %]
418
            table_settings.push({
418
            table_settings.push({
419
                columname: "[% attrh.attribute | html %]",
419
                columname: "[% attrh.attribute | html %]",
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt (-2 / +2 lines)
Lines 615-622 Link Here
615
    [% INCLUDE 'columns_settings.inc' %]
615
    [% INCLUDE 'columns_settings.inc' %]
616
    [% Asset.js("js/pages/stockrotation.js") | $raw %]
616
    [% Asset.js("js/pages/stockrotation.js") | $raw %]
617
    <script>
617
    <script>
618
        var stock_rotation_items_columns_settings = [% TablesSettings.GetColumns( 'tools', 'stockrotation', 'stock_rotation_manage_items', 'json' ) | $raw %];
618
        var stock_rotation_items_table_settings = [% TablesSettings.GetTableSettings( 'tools', 'stockrotation', 'stock_rotation_manage_items', 'json' ) | $raw %];
619
        var stock_rotation_columns_settings = [% TablesSettings.GetColumns( 'tools', 'stockrotation', 'stock_rotation', 'json' ) | $raw %];
619
        var stock_rotation_table_settings = [% TablesSettings.GetTableSettings( 'tools', 'stockrotation', 'stock_rotation', 'json' ) | $raw %];
620
        $("#addStageModal, #addItemsModal").on("shown.bs.modal", function(){
620
        $("#addStageModal, #addItemsModal").on("shown.bs.modal", function(){
621
            $("#branch, #barcode").focus();
621
            $("#branch, #barcode").focus();
622
        });
622
        });
(-)a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js (-1 / +1 lines)
Lines 693-699 $(document).ready(function() { Link Here
693
                    .append(ul)
693
                    .append(ul)
694
                    .insertBefore(oSettings.nTableWrapper)
694
                    .insertBefore(oSettings.nTableWrapper)
695
            },
695
            },
696
        }, columns_settings_issues_table);
696
        }, table_settings_issues_table);
697
697
698
        if ( $("#issues-table").length ) {
698
        if ( $("#issues-table").length ) {
699
            $("#issues-table_processing").position({
699
            $("#issues-table_processing").position({
(-)a/koha-tmpl/intranet-tmpl/prog/js/marc_modification_templates.js (-2 / +2 lines)
Lines 1-4 Link Here
1
/* global __ KohaTable columns_settings */
1
/* global __ KohaTable table_settings */
2
$(document).ready(function() {
2
$(document).ready(function() {
3
    window.modaction_legend_innerhtml = $("#modaction_legend").text();
3
    window.modaction_legend_innerhtml = $("#modaction_legend").text();
4
    window.action_submit_value = $("#action_submit").val();
4
    window.action_submit_value = $("#action_submit").val();
Lines 110-116 $(document).ready(function() { Link Here
110
    });
110
    });
111
111
112
    KohaTable("templatest", {
112
    KohaTable("templatest", {
113
    }, columns_settings);
113
    }, table_settings);
114
114
115
});
115
});
116
116
(-)a/koha-tmpl/intranet-tmpl/prog/js/pages/stockrotation.js (-3 / +2 lines)
Lines 72-78 $(document).ready(function() { Link Here
72
        ],
72
        ],
73
        "sPaginationType": "full",
73
        "sPaginationType": "full",
74
        "autoWidth": false,
74
        "autoWidth": false,
75
    }, stock_rotation_items_columns_settings);
75
    }, stock_rotation_items_table_settings);
76
76
77
    KohaTable("stock_rotation", {
77
    KohaTable("stock_rotation", {
78
        "aoColumnDefs": [
78
        "aoColumnDefs": [
Lines 81-86 $(document).ready(function() { Link Here
81
        ],
81
        ],
82
        "sPaginationType": "full",
82
        "sPaginationType": "full",
83
        "autoWidth": false,
83
        "autoWidth": false,
84
    }, stock_rotation_columns_settings);
84
    }, stock_rotation_table_settings);
85
85
86
});
86
});
87
- 

Return to bug 29648