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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt (-5 / +4 lines)
Lines 89-95 Link Here
89
        [% END %]
89
        [% END %]
90
        <td>
90
        <td>
91
            [% FOREACH holdingbranch IN reserveloo.holdingbranches %]
91
            [% FOREACH holdingbranch IN reserveloo.holdingbranches %]
92
                [% Branches.GetName ( holdingbranch ) %]<br>
92
                [% Branches.GetName ( holdingbranch ) %]
93
            [% END %]
93
            [% END %]
94
        </td>
94
        </td>
95
        <td><p>[% reserveloo.itemcallnumber %]</p></td>
95
        <td><p>[% reserveloo.itemcallnumber %]</p></td>
Lines 102-108 Link Here
102
        </td>
102
        </td>
103
        <td>
103
        <td>
104
        [% FOREACH loc IN reserveloo.locations %]
104
        [% FOREACH loc IN reserveloo.locations %]
105
            [% AuthorisedValues.GetByCode('LOC', loc) %]<br>
105
            [% AuthorisedValues.GetByCode('LOC', loc) %]
106
        [% END %]
106
        [% END %]
107
        </td>
107
        </td>
108
        <td>
108
        <td>
Lines 208-214 Link Here
208
            "aoColumnDefs": [
208
            "aoColumnDefs": [
209
                { "sType": "anti-the", "aTargets" : [ "anti-the" ] },
209
                { "sType": "anti-the", "aTargets" : [ "anti-the" ] },
210
                { "sType": "title-string", "aTargets" : [ "title-string" ] },
210
                { "sType": "title-string", "aTargets" : [ "title-string" ] },
211
                { "sType": "string", "aTargets": [ "string-sort" ] } //Target columns that use <br> separators and pull-down menus.
211
                { "sType": "string", "aTargets": [ "string-sort" ] }
212
            ],
212
            ],
213
            "sPaginationType": "full_numbers"
213
            "sPaginationType": "full_numbers"
214
          }, columns_settings);
214
          }, columns_settings);
Lines 218-224 Link Here
218
            var cD = ColumnData;
218
            var cD = ColumnData;
219
            var new_array = new Array();
219
            var new_array = new Array();
220
            for ( j=0 ; j<cD.length ; j++ ) {
220
            for ( j=0 ; j<cD.length ; j++ ) {
221
                var split_array = cD[j].split(/<br>/gi);
221
                var split_array = cD[j].split(/\n/gi);
222
                for ( k=0 ; k<split_array.length ; k++ ){
222
                for ( k=0 ; k<split_array.length ; k++ ){
223
                    var str = $.trim(split_array[k].replace(/[\n\r]/g, ''));
223
                    var str = $.trim(split_array[k].replace(/[\n\r]/g, ''));
224
                    if ($.inArray(str, new_array) == -1 && str.length > 0 ) {
224
                    if ($.inArray(str, new_array) == -1 && str.length > 0 ) {
225
- 

Return to bug 20637