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 168-174 canned reports and writing custom SQL reports.</p> Link Here
168
                    [% IF (usecache) %] <th>Cache expiry (seconds)</th> [% END %]
169
                    [% IF (usecache) %] <th>Cache expiry (seconds)</th> [% END %]
169
                    <th>Saved results</th>
170
                    <th>Saved results</th>
170
                    [% IF has_obsolete_reports %]<th>Update</th>[% END %]
171
                    [% IF has_obsolete_reports %]<th>Update</th>[% END %]
171
                    <th>&nbsp;</th>
172
                    <th>Actions</th>
172
                </tr>
173
                </tr>
173
            </thead>
174
            </thead>
174
            <tbody>
175
            <tbody>
Lines 928-935 Sub report:<select name="subreport"> Link Here
928
    [% INCLUDE 'calendar.inc' %]
929
    [% INCLUDE 'calendar.inc' %]
929
    [% IF ( saved1 ) %]
930
    [% IF ( saved1 ) %]
930
        [% INCLUDE 'datatables.inc' %]
931
        [% INCLUDE 'datatables.inc' %]
932
        [% INCLUDE 'columns_settings.inc' %]
931
    [% END %]
933
    [% END %]
932
    <script type="text/javascript">
934
    <script>
933
        var MSG_CONFIRM_DELETE = _("Are you sure you want to delete this report? This cannot be undone.");
935
        var MSG_CONFIRM_DELETE = _("Are you sure you want to delete this report? This cannot be undone.");
934
        var group_subgroups = {};
936
        var group_subgroups = {};
935
        [% FOREACH group IN groups_with_subgroups %]
937
        [% FOREACH group IN groups_with_subgroups %]
Lines 959-964 Sub report:<select name="subreport"> Link Here
959
        }
961
        }
960
962
961
        $(document).ready(function(){
963
        $(document).ready(function(){
964
            var columns_settings = [% ColumnsSettings.GetColumns( 'reports', 'saved-sql', 'table_reports', 'json' ) %];
962
            $('#limit').change(function() {
965
            $('#limit').change(function() {
963
                $('#limitselect').submit();
966
                $('#limitselect').submit();
964
            });
967
            });
Lines 977-983 Sub report:<select name="subreport"> Link Here
977
            });
980
            });
978
981
979
            [% IF (saved1) %]
982
            [% IF (saved1) %]
980
                var rtable = $("#table_reports").dataTable($.extend(true, {}, dataTablesDefaults, {
983
                var rtable = KohaTable("table_reports", {
981
                    'iDisplayLength': [% Koha.Preference('NumSavedReports') %],
984
                    'iDisplayLength': [% Koha.Preference('NumSavedReports') %],
982
                    'bAutoWidth': false,
985
                    'bAutoWidth': false,
983
                    'sPaginationType': 'four_button',
986
                    'sPaginationType': 'four_button',
Lines 990-997 Sub report:<select name="subreport"> Link Here
990
                    ],
993
                    ],
991
                    'oLanguage': {
994
                    'oLanguage': {
992
                        'sZeroRecords': _("No matching reports found")
995
                        'sZeroRecords': _("No matching reports found")
993
                    }
996
                    },
994
                }));
997
                }, columns_settings);
995
998
996
                var rtabs = $("#tabs").tabs();
999
                var rtabs = $("#tabs").tabs();
997
                rtabs.on("tabsactivate", function(e, ui) {
1000
                rtabs.on("tabsactivate", function(e, ui) {
998
- 

Return to bug 20350