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

(-)a/installer/data/mysql/updatedatabase.pl (+10 lines)
Lines 8202-8207 if ( CheckVersion($DBversion) ) { Link Here
8202
    SetVersion($DBversion);
8202
    SetVersion($DBversion);
8203
}
8203
}
8204
8204
8205
$DBversion = "3.15.00.XXX";
8206
if ( CheckVersion($DBversion) ) {
8207
    $dbh->do(q{
8208
        DELETE FROM systempreferences WHERE variable = 'UseTableSortForCirc'
8209
    });
8210
8211
    print "Upgrade to $DBversion done (Bug 11703 - Convert checkouts table to ajax datatable)\n";
8212
    SetVersion($DBversion);
8213
}
8214
8205
=head1 FUNCTIONS
8215
=head1 FUNCTIONS
8206
8216
8207
=head2 TableExists($table)
8217
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc (+1 lines)
Lines 13-18 Link Here
13
    var BY = _("by");
13
    var BY = _("by");
14
    var ON_HOLD = _("On hold");
14
    var ON_HOLD = _("On hold");
15
    var NOT_RENEWABLE = _("Not renewable");
15
    var NOT_RENEWABLE = _("Not renewable");
16
    var NOT_RENEWABLE_TOO_SOON = _("Cannot renew, renewal is premature");
16
    var OF = _("of");
17
    var OF = _("of");
17
    var RENEWALS_REMAINING = _("renewals remaining");
18
    var RENEWALS_REMAINING = _("renewals remaining");
18
    var HOLD_IS = _("Hold is");
19
    var HOLD_IS = _("Hold is");
(-)a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js (+7 lines)
Lines 234-239 $(document).ready(function() { Link Here
234
234
235
                        span_style = "display: none";
235
                        span_style = "display: none";
236
                        span_class = "renewals-allowed";
236
                        span_class = "renewals-allowed";
237
                    } else if ( oObj.can_renew_error == "too_soon" ) {
238
                        content += "<span class='renewals-disabled'>"
239
                                + NOT_RENEWABLE_TOO_SOON
240
                                + "</span>";
241
242
                        span_style = "display: none";
243
                        span_class = "renewals-allowed";
237
                    } else {
244
                    } else {
238
                        content += "<span class='renewals-disabled'>"
245
                        content += "<span class='renewals-disabled'>"
239
                                + oObj.can_renew_error
246
                                + oObj.can_renew_error
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt (+4 lines)
Lines 513-518 Link Here
513
513
514
            <p>The <a href="http://www.openjs.com/scripts/events/keyboard_shortcuts/">OpenJS keyboard shortcuts library</a>
514
            <p>The <a href="http://www.openjs.com/scripts/events/keyboard_shortcuts/">OpenJS keyboard shortcuts library</a>
515
               by Binny V A is licensed under the BSD license.</p>
515
               by Binny V A is licensed under the BSD license.</p>
516
517
            <h2>jquery.dataTables.grouping.js</h2>
518
            <p>The <a href="https://code.google.com/p/jquery-datatables-row-grouping/">jquery.dataTables.grouping.js</a>
519
               plugin by Jovan Popovic is licensed under the BSD and GPL v2 license.</p>
516
        </div>
520
        </div>
517
521
518
        <div id="translations">
522
        <div id="translations">
(-)a/svc/checkouts.pl (-2 / +1 lines)
Lines 97-103 if ( @borrowernumber == 1 ) { Link Here
97
    $sql .= '= ?';
97
    $sql .= '= ?';
98
}
98
}
99
else {
99
else {
100
    $sql = ' IN (' . join( ',', ('?') x @borrowernumber ) . ') ';
100
    $sql .= ' IN (' . join( ',', ('?') x @borrowernumber ) . ') ';
101
}
101
}
102
push( @parameters, @borrowernumber );
102
push( @parameters, @borrowernumber );
103
103
104
- 

Return to bug 11703