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

(-)a/admin/columns_settings.yml (+18 lines)
Lines 618-620 modules: Link Here
618
          columnname: ordered
618
          columnname: ordered
619
        -
619
        -
620
          columnname: spent
620
          columnname: spent
621
622
  tools:
623
    notices:
624
      lettert:
625
        -
626
          columnname: library
627
        -
628
          columnname: module
629
        -
630
          columnname: code
631
        -
632
          columnname: name
633
        -
634
          columnname: copy_notice
635
        -
636
          columnname: actions
637
          cannot_be_toggled: 1
638
          cannot_be_modified: 1
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt (+6 lines)
Lines 146-151 Link Here
146
            [% PROCESS pagelist module=modules.members modulename="members" %]
146
            [% PROCESS pagelist module=modules.members modulename="members" %]
147
          </div>
147
          </div>
148
148
149
            <h3><a href="#tools">Tools</a></h3>
150
            <div id="tools">
151
                <h4>Tools tables</h4>
152
                [% PROCESS pagelist module=modules.tools modulename="tools" %]
153
            </div>
154
149
          <h3><a href="#opac">OPAC</a></h3>
155
          <h3><a href="#opac">OPAC</a></h3>
150
          <div id="opac">
156
          <div id="opac">
151
            <h4>OPAC tables</h4>
157
            <h4>OPAC tables</h4>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt (+4 lines)
Lines 2-7 Link Here
2
[% USE Asset %]
2
[% USE Asset %]
3
[% USE Koha %]
3
[% USE Koha %]
4
[% USE Branches %]
4
[% USE Branches %]
5
[% USE ColumnsSettings %]
5
[% SET footerjs = 1 %]
6
[% SET footerjs = 1 %]
6
[% INCLUDE 'doc-head-open.inc' %]
7
[% INCLUDE 'doc-head-open.inc' %]
7
<title>Koha &rsaquo; Tools &rsaquo; Notices[% IF ( add_form or copy_form ) %][% IF ( modify ) %] &rsaquo; Modify notice[% ELSE %] &rsaquo; Add notice[% END %][% END %][% IF ( add_validate or copy_validate) %] &rsaquo; Notice added[% END %][% IF ( delete_confirm ) %] &rsaquo; Confirm deletion[% END %]</title>
8
<title>Koha &rsaquo; Tools &rsaquo; Notices[% IF ( add_form or copy_form ) %][% IF ( modify ) %] &rsaquo; Modify notice[% ELSE %] &rsaquo; Add notice[% END %][% END %][% IF ( add_validate or copy_validate) %] &rsaquo; Notice added[% END %][% IF ( delete_confirm ) %] &rsaquo; Confirm deletion[% END %]</title>
Lines 460-465 Link Here
460
[% MACRO jsinclude BLOCK %]
461
[% MACRO jsinclude BLOCK %]
461
    [% Asset.js("js/tools-menu.js") | $raw %]
462
    [% Asset.js("js/tools-menu.js") | $raw %]
462
    [% INCLUDE 'datatables.inc' %]
463
    [% INCLUDE 'datatables.inc' %]
464
    [% INCLUDE 'columns_settings.inc' %]
463
    [% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") | $raw %]
465
    [% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") | $raw %]
464
    [% Asset.js("lib/jquery/plugins/jquery.insertatcaret.js") | $raw %]
466
    [% Asset.js("lib/jquery/plugins/jquery.insertatcaret.js") | $raw %]
465
    <script>
467
    <script>
Lines 476-481 Link Here
476
        var MSG_EMPTY_TITLE_AND_CONTENT = _("Please specify title and content for %s");
478
        var MSG_EMPTY_TITLE_AND_CONTENT = _("Please specify title and content for %s");
477
        var MSG_EMPTY_TEMPLATES = _("Please fill at least one template.");
479
        var MSG_EMPTY_TEMPLATES = _("Please fill at least one template.");
478
        var MSG_LOADING = _("Loading");
480
        var MSG_LOADING = _("Loading");
481
        var MSG_NO_NOTICE_FOUND = _("No matching notices found");
482
        var columns_settings = [% ColumnsSettings.GetColumns( 'tools', 'notices', 'lettert', 'json' ) | $raw %];
479
     </script>
483
     </script>
480
    [% Asset.js("js/letter.js") | $raw %]
484
    [% Asset.js("js/letter.js") | $raw %]
481
[% END %]
485
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/js/letter.js (-8 / +12 lines)
Lines 1-5 Link Here
1
/* Variables defined in letter.tt: */
1
/* Variables defined in letter.tt: */
2
/* global _ module add_form copy_form dataTablesDefaults no_op_set MSG_EMPTY_TITLE_AND_CONTENT MSG_EMPTY_TEMPLATES code MSG_CODE_EXISTS MSG_CODE_EXISTS_FOR_LIBRARY MSG_DT_LOADING_RECORDS interface theme */
2
/* global _ module add_form copy_form no_op_set MSG_EMPTY_TITLE_AND_CONTENT MSG_EMPTY_TEMPLATES code MSG_CODE_EXISTS MSG_CODE_EXISTS_FOR_LIBRARY MSG_DT_LOADING_RECORDS interface theme KohaTable columns_settings */
3
3
4
var modal_loading = "<div id=\"loading\"><img src=\"" + interface + "/" + theme + "/img/spinner-small.gif\" alt=\"\" /> "+ MSG_DT_LOADING_RECORDS +"</div>";
4
var modal_loading = "<div id=\"loading\"><img src=\"" + interface + "/" + theme + "/img/spinner-small.gif\" alt=\"\" /> "+ MSG_DT_LOADING_RECORDS +"</div>";
5
5
Lines 35-47 $(document).ready(function() { Link Here
35
        $('#toolbar').fixFloat();
35
        $('#toolbar').fixFloat();
36
    }
36
    }
37
37
38
    $("#lettert:has(tbody tr)").dataTable($.extend(true, {}, dataTablesDefaults, {
38
    var ntable = KohaTable("lettert", {
39
        "sDom": 't',
39
        "autoWidth": false,
40
        "aoColumnDefs": [
40
        "paging": false,
41
            { "bSortable": false, "bSearchable": false, 'aTargets': [ 'nosort' ] }
41
        "aaSorting": [[ 3, "asc" ]],
42
        "columnDefs": [
43
            { "bSortable": false, "aTargets": [ "nosort" ] },
44
            { "sType": "title-string", "aTargets" : [ "title-string"] }
42
        ],
45
        ],
43
        "bPaginate": false
46
        "oLanguage": {
44
    }));
47
            "sZeroRecords": MSG_NO_NOTICE_FOUND
48
        },
49
    }, columns_settings);
45
50
46
    if( no_op_set ){
51
    if( no_op_set ){
47
        $('#branch').change(function() {
52
        $('#branch').change(function() {
48
- 

Return to bug 21216