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

(-)a/admin/columns_settings.yml (+49 lines)
Lines 995-1000 modules: Link Here
995
        -
995
        -
996
          columnname: items_needed
996
          columnname: items_needed
997
997
998
    holds_awaiting_pickup:
999
      holdst:
1000
        -
1001
          columnname: waiting_since
1002
        -
1003
          columnname: date_hold_placed
1004
        -
1005
          columnname: title
1006
        -
1007
          columnname: patron
1008
        -
1009
          columnname: home_library
1010
        -
1011
          columnname: current_location
1012
        -
1013
          columnname: shelving_location
1014
        -
1015
          columnname: call_number
1016
        -
1017
          columnname: copy_number
1018
        -
1019
          columnname: enumeration
1020
        -
1021
          columnname: action
1022
1023
      holdso:
1024
        -
1025
          columnname: waiting_since
1026
        -
1027
          columnname: date_hold_placed
1028
        -
1029
          columnname: title
1030
        -
1031
          columnname: patron
1032
        -
1033
          columnname: home_library
1034
        -
1035
          columnname: current_location
1036
        -
1037
          columnname: shelving_location
1038
        -
1039
          columnname: call_number
1040
        -
1041
          columnname: copy_number
1042
        -
1043
          columnname: enumeration
1044
        -
1045
          columnname: action
1046
998
    overdues:
1047
    overdues:
999
      circ-overdues:
1048
      circ-overdues:
1000
        -
1049
        -
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc (-1 / +1 lines)
Lines 13-19 Link Here
13
            <th>Call number</th>
13
            <th>Call number</th>
14
            <th>Copy number</th>
14
            <th>Copy number</th>
15
            <th>Enumeration</th>
15
            <th>Enumeration</th>
16
            <th>Action</th>
16
            <th class="NoSort noExport">Actions</th>
17
        </tr>
17
        </tr>
18
    </thead>
18
    </thead>
19
    <tbody>
19
    <tbody>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt (-9 / +24 lines)
Lines 3-8 Link Here
3
[% USE Koha %]
3
[% USE Koha %]
4
[% USE KohaDates %]
4
[% USE KohaDates %]
5
[% USE Branches %]
5
[% USE Branches %]
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; Circulation &rsaquo; Holds awaiting pickup</title>
9
<title>Koha &rsaquo; Circulation &rsaquo; Holds awaiting pickup</title>
Lines 27-33 Link Here
27
                [% IF Koha.Preference('CircSidebar') %]
28
                [% IF Koha.Preference('CircSidebar') %]
28
                    <div class="col-sm-10 col-sm-push-2">
29
                    <div class="col-sm-10 col-sm-push-2">
29
                [% ELSE %]
30
                [% ELSE %]
30
                    <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
31
                    <div class="col-sm-12">
31
                [% END %]
32
                [% END %]
32
33
33
        <h2>Holds awaiting pickup for your library on: [% show_date | $KohaDates %]
34
        <h2>Holds awaiting pickup for your library on: [% show_date | $KohaDates %]
Lines 120-137 Link Here
120
121
121
[% MACRO jsinclude BLOCK %]
122
[% MACRO jsinclude BLOCK %]
122
    [% INCLUDE 'datatables.inc' %]
123
    [% INCLUDE 'datatables.inc' %]
124
    [% INCLUDE 'columns_settings.inc' %]
123
    <script>
125
    <script>
126
        var holdst_columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'holds_awaiting_pickup', 'holdst', 'json' ) | $raw %];
127
        var holdso_columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'holds_awaiting_pickup', 'holdso', 'json' ) | $raw %];
128
124
        $(document).ready(function() {
129
        $(document).ready(function() {
125
            $('#resultlist').tabs();
130
126
            $("th a").hide();
131
            KohaTable("holdst", {
127
            $("#holdst,#holdso").dataTable($.extend(true, {}, dataTablesDefaults, {
132
                "aoColumnDefs": [
133
                    { "sortable": false, "searchable": false, 'targets': [ 'NoSort' ] },
134
                    { "type": "anti-the", "targets" : [ "anti-the" ] },
135
                    { "type": "title-string", "targets" : [ "title-string" ] }
136
                ],
137
                "sPaginationType": "full"
138
            }, holdst_columns_settings);
139
140
            KohaTable("holdso", {
128
                "aoColumnDefs": [
141
                "aoColumnDefs": [
129
                    { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
142
                    { "sortable": false, "searchable": false, 'targets': [ 'NoSort' ] },
130
                    { "sType": "anti-the", "aTargets" : [ "anti-the" ] },
143
                    { "type": "anti-the", "targets" : [ "anti-the" ] },
131
                    { "sType": "title-string", "aTargets" : [ "title-string" ] }
144
                    { "type": "title-string", "targets" : [ "title-string" ] }
132
                ],
145
                ],
133
                "sPaginationType": "full"
146
                "sPaginationType": "full"
134
            }));
147
            }, holdso_columns_settings);
148
149
            $('#resultlist').tabs();
150
135
        });
151
        });
136
    </script>
152
    </script>
137
[% END %]
153
[% END %]
138
- 

Return to bug 11281