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

(-)a/admin/columns_settings.yml (-1 / +44 lines)
Lines 317-322 modules: Link Here
317
        -
317
        -
318
          columnname: notes
318
          columnname: notes
319
319
320
    saved-sql:
321
      table_reports:
322
        -
323
          columnname: selection
324
          cannot_be_toggled: 1
325
          cannot_be_modified: 1
326
        -
327
          columnname: report_id
328
          cannot_be_toggled: 1
329
          cannot_be_modified: 1
330
        -
331
          columnname: report_name
332
        -
333
          columnname: type
334
        -
335
          columnname: group
336
        -
337
          columnname: subgroup
338
        -
339
          columnname: notes
340
        -
341
          columnname: author
342
        -
343
          columnname: creation_date
344
        -
345
          columnname: last_edit
346
        -
347
          columnname: last_run
348
        -
349
          columnname: public
350
        -
351
          columnname: json_url
352
        -
353
          columnname: cache_expiry
354
        -
355
          columnname: saved_results
356
        -
357
          columnname: update
358
        -
359
          columnname: actions
360
          cannot_be_toggled: 1
361
          cannot_be_modified: 1
362
320
  circ:
363
  circ:
321
    circulation:
364
    circulation:
322
      issues-table:
365
      issues-table:
Lines 401-407 modules: Link Here
401
        -
444
        -
402
          columnname: title
445
          columnname: title
403
        -
446
        -
404
          columnname: collection:
447
          columnname: collection
405
        -
448
        -
406
          columnname: document_type
449
          columnname: document_type
407
        -
450
        -
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt (-6 / +8 lines)
Lines 1-5 Link Here
1
[% USE KohaDates %]
1
[% USE KohaDates %]
2
[% USE Koha %]
2
[% USE Koha %]
3
[% USE ColumnsSettings %]
3
[% SET footerjs = 1 %]
4
[% SET footerjs = 1 %]
4
[%- BLOCK area_name -%]
5
[%- BLOCK area_name -%]
5
    [%- SWITCH area -%]
6
    [%- SWITCH area -%]
Lines 178-184 canned reports and writing custom SQL reports.</p> Link Here
178
                    [% IF (usecache) %] <th>Cache expiry (seconds)</th> [% END %]
179
                    [% IF (usecache) %] <th>Cache expiry (seconds)</th> [% END %]
179
                    <th>Saved results</th>
180
                    <th>Saved results</th>
180
                    [% IF has_obsolete_reports %]<th>Update</th>[% END %]
181
                    [% IF has_obsolete_reports %]<th>Update</th>[% END %]
181
                    <th>&nbsp;</th>
182
                    <th>Actions</th>
182
                </tr>
183
                </tr>
183
            </thead>
184
            </thead>
184
            <tbody>
185
            <tbody>
Lines 953-960 Sub report:<select name="subreport"> Link Here
953
    [% INCLUDE 'calendar.inc' %]
954
    [% INCLUDE 'calendar.inc' %]
954
    [% IF ( saved1 ) %]
955
    [% IF ( saved1 ) %]
955
        [% INCLUDE 'datatables.inc' %]
956
        [% INCLUDE 'datatables.inc' %]
957
        [% INCLUDE 'columns_settings.inc' %]
956
    [% END %]
958
    [% END %]
957
    <script type="text/javascript">
959
    <script>
958
        var MSG_CONFIRM_DELETE = _("Are you sure you want to delete this report? This cannot be undone.");
960
        var MSG_CONFIRM_DELETE = _("Are you sure you want to delete this report? This cannot be undone.");
959
        var group_subgroups = {};
961
        var group_subgroups = {};
960
        [% FOREACH group IN groups_with_subgroups %]
962
        [% FOREACH group IN groups_with_subgroups %]
Lines 986-991 Sub report:<select name="subreport"> Link Here
986
        $(document).ready(function(){
988
        $(document).ready(function(){
987
989
988
            $('[data-toggle="tooltip"]').tooltip();
990
            $('[data-toggle="tooltip"]').tooltip();
991
            var columns_settings = [% ColumnsSettings.GetColumns( 'reports', 'saved-sql', 'table_reports', 'json' ) %];
989
992
990
            $('#limit').change(function() {
993
            $('#limit').change(function() {
991
                $('#limitselect').submit();
994
                $('#limitselect').submit();
Lines 1009-1015 Sub report:<select name="subreport"> Link Here
1009
            });
1012
            });
1010
1013
1011
            [% IF (saved1) %]
1014
            [% IF (saved1) %]
1012
                var rtable = $("#table_reports").dataTable($.extend(true, {}, dataTablesDefaults, {
1015
                var rtable = KohaTable("table_reports", {
1013
                    'iDisplayLength': [% Koha.Preference('NumSavedReports') %],
1016
                    'iDisplayLength': [% Koha.Preference('NumSavedReports') %],
1014
                    'bAutoWidth': false,
1017
                    'bAutoWidth': false,
1015
                    'sPaginationType': 'four_button',
1018
                    'sPaginationType': 'four_button',
Lines 1022-1029 Sub report:<select name="subreport"> Link Here
1022
                    ],
1025
                    ],
1023
                    'oLanguage': {
1026
                    'oLanguage': {
1024
                        'sZeroRecords': _("No matching reports found")
1027
                        'sZeroRecords': _("No matching reports found")
1025
                    }
1028
                    },
1026
                }));
1029
                }, columns_settings);
1027
1030
1028
                var rtabs = $("#tabs").tabs();
1031
                var rtabs = $("#tabs").tabs();
1029
                rtabs.on("tabsactivate", function(e, ui) {
1032
                rtabs.on("tabsactivate", function(e, ui) {
1030
- 

Return to bug 20350