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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt (-3 / +15 lines)
Lines 284-295 Link Here
284
                                                    [% IF ( hardduedatecompare == '-1' ) %]
284
                                                    [% IF ( hardduedatecompare == '-1' ) %]
285
                                                      before [% hardduedate | $KohaDates %]
285
                                                      before [% hardduedate | $KohaDates %]
286
                                                      <input type="hidden" name="hardduedatecomparebackup" value="-1" />
286
                                                      <input type="hidden" name="hardduedatecomparebackup" value="-1" />
287
                                                      <input type="hidden" name="hardduedatebackup" value="[% hardduedate | html %]" />
287
                                                    [% ELSIF ( hardduedatecompare == '0' ) %]
288
                                                    [% ELSIF ( hardduedatecompare == '0' ) %]
288
                                                      on [% hardduedate | $KohaDates %]
289
                                                      on [% hardduedate | $KohaDates %]
289
                                                      <input type="hidden" name="hardduedatecomparebackup" value="0" />
290
                                                      <input type="hidden" name="hardduedatecomparebackup" value="0" />
291
                                                      <input type="hidden" name="hardduedatebackup" value="[% hardduedate | html %]" />
290
                                                    [% ELSIF ( hardduedatecompare == '1' ) %]
292
                                                    [% ELSIF ( hardduedatecompare == '1' ) %]
291
                                                      after [% hardduedate | $KohaDates %]
293
                                                      after [% hardduedate | $KohaDates %]
292
                                                      <input type="hidden" name="hardduedatecomparebackup" value="1" />
294
                                                      <input type="hidden" name="hardduedatecomparebackup" value="1" />
295
                                                      <input type="hidden" name="hardduedatebackup" value="[% hardduedate | html %]" />
293
                                                    [% END %]
296
                                                    [% END %]
294
                                                  [% ELSE %]
297
                                                  [% ELSE %]
295
                                                    <span>None defined</span>
298
                                                    <span>None defined</span>
Lines 332-338 Link Here
332
                                                    [% END %]
335
                                                    [% END %]
333
                                                </td>
336
                                                </td>
334
                                                <td>[% no_auto_renewal_after | html %]</td>
337
                                                <td>[% no_auto_renewal_after | html %]</td>
335
                                                <td>[% no_auto_renewal_after_hard_limit | $KohaDates %]</td>
338
                                                <td>
339
                                                    [% no_auto_renewal_after_hard_limit | $KohaDates %]
340
                                                    <input type="hidden" name="no_auto_renewal_after_hard_limit_backup" value="[% no_auto_renewal_after_hard_limit | html %]" />
341
                                                </td>
336
                                                <td>
342
                                                <td>
337
                                                    [% IF reservesallowed.defined && reservesallowed != '' %]
343
                                                    [% IF reservesallowed.defined && reservesallowed != '' %]
338
                                                        [% reservesallowed | html %]
344
                                                        [% reservesallowed | html %]
Lines 1505-1518 Link Here
1505
                    } else if ( i == 9 ) {
1511
                    } else if ( i == 9 ) {
1506
                        // specific processing for the Hard due date column
1512
                        // specific processing for the Hard due date column
1507
                        var select_value = $(this).find("input[type='hidden'][name='hardduedatecomparebackup']").val();
1513
                        var select_value = $(this).find("input[type='hidden'][name='hardduedatecomparebackup']").val();
1514
                        var hardduedate = $(this).find("input[type='hidden'][name='hardduedatebackup']").val();
1508
                        var input_value = '';
1515
                        var input_value = '';
1509
                        if (typeof select_value === 'undefined'){
1516
                        if (typeof select_value === 'undefined'){
1510
                            select_value = '-1';
1517
                            select_value = '-1';
1511
                        }else {
1518
                        }else {
1512
                            input_value = itm_text.split(' ')[1];
1519
                            input_value = itm_text.split(' ')[1];
1513
                        }
1520
                        }
1521
                        $(current_column).find("input[type='hidden']").val(hardduedate);
1514
                        $(current_column).find("input[type='text']").val(input_value);
1522
                        $(current_column).find("input[type='text']").val(input_value);
1515
                        $(current_column).find("select").val(select_value);
1523
                        $(current_column).find("select").val(select_value);
1524
                    } else if ( i == 26 ) {
1525
                        // specific processing for the No automatic renewal after (hard limit) column
1526
                        var date = $(this).find("input[type='hidden'][name='no_auto_renewal_after_hard_limit_backup']").val();
1527
                        $(current_column).find("input[type='hidden']").val(date);
1528
                        $(current_column).find("input[type='text']").val(itm_text);
1516
                    } else if ( i == 16 ) {
1529
                    } else if ( i == 16 ) {
1517
                        // specific processing for cap_fine_to_replacement_price
1530
                        // specific processing for cap_fine_to_replacement_price
1518
                        var cap_fine_to_replacement_price = $(this).find("input[type='checkbox']");
1531
                        var cap_fine_to_replacement_price = $(this).find("input[type='checkbox']");
Lines 1542-1548 Link Here
1542
                            // Remove potential previous input added
1555
                            // Remove potential previous input added
1543
                            $(current_column).find("input").remove();
1556
                            $(current_column).find("input").remove();
1544
                            $(current_column).append("<input type='hidden' name='"+name+"' value='"+val+"' />");
1557
                            $(current_column).append("<input type='hidden' name='"+name+"' value='"+val+"' />");
1545
                        } else if ( i == 5 || i == 6 || i == 26 || i == 27 || i == 28 || current_input_id === "holds_pickup_period" ) {
1558
                        } else if ( i == 5 || i == 6 || i == 27 || i == 28 || i == 29 || current_input_id === "holds_pickup_period" ) {
1546
                            // If the value is not an integer for
1559
                            // If the value is not an integer for
1547
                            //     - "Current checkouts allowed"
1560
                            //     - "Current checkouts allowed"
1548
                            //     - "Current on-site checkouts allowed"
1561
                            //     - "Current on-site checkouts allowed"
1549
- 

Return to bug 35341