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

(-)a/admin/columns_settings.yml (+34 lines)
Lines 124-129 modules: Link Here
124
        -
124
        -
125
          columnname: actions
125
          columnname: actions
126
126
127
    categories:
128
      patron_categories:
129
        -
130
          columnname: code
131
        -
132
          columnname: category_name
133
        -
134
          columnname: type
135
        -
136
          columnname: enrollment_period
137
        -
138
          columnname: age_required
139
        -
140
          columnname: upper_age_limit
141
        -
142
          columnname: enrollment_fee
143
        -
144
          columnname: overdue
145
        -
146
          columnname: lost_items
147
        -
148
          columnname: hold_fee
149
        -
150
          columnname: messaging
151
        -
152
          columnname: branches_limitations
153
        -
154
          columnname: default_privacy
155
        -
156
          columnname: actions
157
          cannot_be_toggled: 1
158
          cannot_be_modified: 1
159
160
127
  catalogue:
161
  catalogue:
128
    detail:
162
    detail:
129
      acquisitiondetails-table:
163
      acquisitiondetails-table:
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt (-1 / +4 lines)
Lines 3-8 Link Here
3
[% USE Koha %]
3
[% USE Koha %]
4
[% USE KohaDates %]
4
[% USE KohaDates %]
5
[% USE Price %]
5
[% USE Price %]
6
[% USE ColumnsSettings %]
6
[% SET footerjs = 1 %]
7
[% SET footerjs = 1 %]
7
[% INCLUDE 'doc-head-open.inc' %]
8
[% INCLUDE 'doc-head-open.inc' %]
8
<title>Koha &rsaquo; Administration &rsaquo; Patron categories &rsaquo; [% IF op == 'add_form' %][% IF ( categorycode ) %]Modify category '[% categorycode | html %]'[% ELSE %]New category[% END %][% END %]
9
<title>Koha &rsaquo; Administration &rsaquo; Patron categories &rsaquo; [% IF op == 'add_form' %][% IF ( categorycode ) %]Modify category '[% categorycode | html %]'[% ELSE %]New category[% END %][% END %]
Lines 338-344 Link Here
338
        You Searched for [% searchfield | html %]</span>
339
        You Searched for [% searchfield | html %]</span>
339
    [% END %]
340
    [% END %]
340
    [% IF categories%]
341
    [% IF categories%]
341
        <table id="table_categorie">
342
        <table id="patron_categories">
342
            <thead>
343
            <thead>
343
                <tr>
344
                <tr>
344
                    <th scope="col">Code</th>
345
                    <th scope="col">Code</th>
Lines 500-508 Link Here
500
    [% Asset.js("js/messaging-preference-form.js") | $raw %]
501
    [% Asset.js("js/messaging-preference-form.js") | $raw %]
501
    [% INCLUDE 'calendar.inc' %]
502
    [% INCLUDE 'calendar.inc' %]
502
    [% INCLUDE 'datatables.inc' %]
503
    [% INCLUDE 'datatables.inc' %]
504
    [% INCLUDE 'columns_settings.inc' %]
503
    <script>
505
    <script>
504
        var MSG_CATEGORYCODE_CHARS = _("Category code can only contain the following characters: letters, numbers, - and _.");
506
        var MSG_CATEGORYCODE_CHARS = _("Category code can only contain the following characters: letters, numbers, - and _.");
505
        var MSG_ONE_ENROLLMENTPERIOD = ("Please choose an enrollment period in months OR by date.");
507
        var MSG_ONE_ENROLLMENTPERIOD = ("Please choose an enrollment period in months OR by date.");
508
        var columns_settings = [% ColumnsSettings.GetColumns( 'admin', 'categories', 'patron_categories', 'json' ) | $raw %];
506
    </script>
509
    </script>
507
    [% Asset.js("js/categories.js") | $raw %]
510
    [% Asset.js("js/categories.js") | $raw %]
508
[% END %]
511
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/js/categories.js (-4 / +4 lines)
Lines 21-27 jQuery.validator.addMethod( "enrollment_period", function(){ Link Here
21
21
22
22
23
$(document).ready(function() {
23
$(document).ready(function() {
24
    $("#table_categorie").dataTable($.extend(true, {}, dataTablesDefaults, {
24
    KohaTable("patron_categories", {
25
        "aoColumnDefs": [{
25
        "aoColumnDefs": [{
26
            "aTargets": [-1],
26
            "aTargets": [-1],
27
            "bSortable": false,
27
            "bSortable": false,
Lines 33-40 $(document).ready(function() { Link Here
33
        "aaSorting": [
33
        "aaSorting": [
34
            [1, "asc"]
34
            [1, "asc"]
35
        ],
35
        ],
36
        "sPaginationType": "four_button"
36
        "sPaginationType": "four_button",
37
    }));
37
        "exportColumns": [0,1,2,3,4,5,6,7,8,9,10,11,12],
38
    }, columns_settings);
38
39
39
    $("#enrolmentperioddate").datepicker({
40
    $("#enrolmentperioddate").datepicker({
40
        minDate: 1
41
        minDate: 1
41
- 

Return to bug 22190