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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt (-8 / +18 lines)
Lines 67-72 Link Here
67
                <th>Patron category</th>
67
                <th>Patron category</th>
68
                <th>Item type</th>
68
                <th>Item type</th>
69
                <th>Actions</th>
69
                <th>Actions</th>
70
                <th>Note</th>
70
                <th>Current checkouts allowed</th>
71
                <th>Current checkouts allowed</th>
71
                <th>Current on-site checkouts allowed</th>
72
                <th>Current on-site checkouts allowed</th>
72
                <th>Loan period</th>
73
                <th>Loan period</th>
Lines 93-99 Link Here
93
                <th>Item level holds</th>
94
                <th>Item level holds</th>
94
                <th>Article requests</th>
95
                <th>Article requests</th>
95
                <th>Rental discount (%)</th>
96
                <th>Rental discount (%)</th>
96
                <th>Note</th>
97
                <th>Actions</th>
97
                <th>Actions</th>
98
            </tr>
98
            </tr>
99
            </thead>
99
            </thead>
Lines 117-122 Link Here
117
                                                          <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&amp;itemtype=[% rule.itemtype | html %]&amp;categorycode=[% rule.categorycode | html %]&amp;branch=[% rule.current_branch | html %]"><i class="fa fa-trash"></i> Delete</a>
117
                                                          <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&amp;itemtype=[% rule.itemtype | html %]&amp;categorycode=[% rule.categorycode | html %]&amp;branch=[% rule.current_branch | html %]"><i class="fa fa-trash"></i> Delete</a>
118
                                                        </td>
118
                                                        </td>
119
119
120
                                                        <td>
121
                                                            [% IF rule.note %]
122
                                                                <a name="viewnote" data-toggle="popover" title="Note" data-content="[% rule.note %]" data-placement="top" data-trigger="hover">View note</a>
123
                                                            [% ELSE %]&nbsp;[% END %]
124
                                                        </td>
120
							<td>[% IF ( rule.unlimited_maxissueqty ) %]
125
							<td>[% IF ( rule.unlimited_maxissueqty ) %]
121
									<span>Unlimited</span>
126
									<span>Unlimited</span>
122
								[% ELSE %]
127
								[% ELSE %]
Lines 244-249 Link Here
244
                        <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button>
249
                        <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button>
245
                        <button name="cancel" class="clear_edit btn btn-default btn-xs"><i class="fa fa-undo"></i> Clear</button>
250
                        <button name="cancel" class="clear_edit btn btn-default btn-xs"><i class="fa fa-undo"></i> Clear</button>
246
                    </td>
251
                    </td>
252
                    <td><input type="text" name="note" id="note" size="15" value="" maxlength="100"></td>
247
                    <td><input type="text" name="maxissueqty" id="maxissueqty" size="3" /></td>
253
                    <td><input type="text" name="maxissueqty" id="maxissueqty" size="3" /></td>
248
                    <td><input type="text" name="maxonsiteissueqty" id="maxonsiteissueqty" size="3" /></td>
254
                    <td><input type="text" name="maxonsiteissueqty" id="maxonsiteissueqty" size="3" /></td>
249
                    <td><input type="text" name="issuelength" id="issuelength" size="3" /> </td>
255
                    <td><input type="text" name="issuelength" id="issuelength" size="3" /> </td>
Lines 315-321 Link Here
315
                        </select>
321
                        </select>
316
                    </td>
322
                    </td>
317
                    <td><input type="text" name="rentaldiscount" id="rentaldiscount" size="2" /></td>
323
                    <td><input type="text" name="rentaldiscount" id="rentaldiscount" size="2" /></td>
318
                    <td><input type="text" name="note" id="note" size="15" value=""></td>
319
                    <td class="actions">
324
                    <td class="actions">
320
                        <input type="hidden" name="branch" value="[% current_branch | html %]"/>
325
                        <input type="hidden" name="branch" value="[% current_branch | html %]"/>
321
                        <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button>
326
                        <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button>
Lines 327-332 Link Here
327
                      <th>Patron category</th>
332
                      <th>Patron category</th>
328
                      <th>Item type</th>
333
                      <th>Item type</th>
329
                      <th>&nbsp;</th>
334
                      <th>&nbsp;</th>
335
                      <th>Note</th>
330
                      <th>Current checkouts allowed</th>
336
                      <th>Current checkouts allowed</th>
331
                      <th>Current on-site checkouts allowed</th>
337
                      <th>Current on-site checkouts allowed</th>
332
                      <th>Loan period</th>
338
                      <th>Loan period</th>
Lines 346-359 Link Here
346
                      <th>No renewal before</th>
352
                      <th>No renewal before</th>
347
                      <th>Automatic renewal</th>
353
                      <th>Automatic renewal</th>
348
                      <th>No automatic renewal after</th>
354
                      <th>No automatic renewal after</th>
349
                       <th>No automatic renewal after (hard limit)</th>
355
                      <th>No automatic renewal after (hard limit)</th>
350
                      <th>Holds allowed (count)</th>
356
                      <th>Holds allowed (count)</th>
351
                      <th>Holds per record (count)</th>
357
                      <th>Holds per record (count)</th>
352
                      <th>On shelf holds allowed</th>
358
                      <th>On shelf holds allowed</th>
353
                      <th>Item level holds</th>
359
                      <th>Item level holds</th>
354
                      <th>Article requests</th>
360
                      <th>Article requests</th>
355
                      <th>Rental discount (%)</th>
361
                      <th>Rental discount (%)</th>
356
                      <th>Note</th>
357
                      <th>&nbsp;</th>
362
                      <th>&nbsp;</th>
358
                    </tr>
363
                    </tr>
359
                  </tfoot>
364
                  </tfoot>
Lines 778-783 Link Here
778
        var MSG_CONFIRM_DELETE = _("Are you sure you want to delete this rule? This cannot be undone.");
783
        var MSG_CONFIRM_DELETE = _("Are you sure you want to delete this rule? This cannot be undone.");
779
784
780
        $(document).ready(function() {
785
        $(document).ready(function() {
786
            $('[data-toggle="popover"]').popover();
787
781
            $(".delete").on("click",function(){
788
            $(".delete").on("click",function(){
782
                return confirmDelete(MSG_CONFIRM_DELETE);
789
                return confirmDelete(MSG_CONFIRM_DELETE);
783
            });
790
            });
Lines 815-821 Link Here
815
                    itm = $(this).text();
822
                    itm = $(this).text();
816
                    itm = itm.replace(/^\s*|\s*$/g,'');
823
                    itm = itm.replace(/^\s*|\s*$/g,'');
817
                    var current_column = $("#edit_row td:eq("+i+")");
824
                    var current_column = $("#edit_row td:eq("+i+")");
818
                    if ( i == 7 ) {
825
                    if ( i == 3 ) {
826
                        // specific processing for the Note column
827
                        var note = $(this).find("a[name='viewnote']").data("content");
828
                        $(current_column).find("input[type='text']").val(note);
829
                    } else if ( i == 8 ) {
819
                        // specific processing for the Hard due date column
830
                        // specific processing for the Hard due date column
820
                        var select_value = $(this).find("input[type='hidden'][name='hardduedatecomparebackup']").val();
831
                        var select_value = $(this).find("input[type='hidden'][name='hardduedatecomparebackup']").val();
821
                        var input_value = '';
832
                        var input_value = '';
Lines 826-832 Link Here
826
                        }
837
                        }
827
                        $(current_column).find("input[type='text']").val(input_value);
838
                        $(current_column).find("input[type='text']").val(input_value);
828
                        $(current_column).find("select").val(select_value);
839
                        $(current_column).find("select").val(select_value);
829
                    } else if ( i == 13 ) {
840
                    } else if ( i == 14 ) {
830
                        // specific processing for cap_fine_to_replacement_price
841
                        // specific processing for cap_fine_to_replacement_price
831
                        var cap_fine_to_replacement_price = $(this).find("input[type='checkbox']");
842
                        var cap_fine_to_replacement_price = $(this).find("input[type='checkbox']");
832
                        $('#cap_fine_to_replacement_price').prop('checked', cap_fine_to_replacement_price.is(':checked') );
843
                        $('#cap_fine_to_replacement_price').prop('checked', cap_fine_to_replacement_price.is(':checked') );
Lines 851-857 Link Here
851
                            // Remove potential previous input added
862
                            // Remove potential previous input added
852
                            $(current_column).find("input").remove();
863
                            $(current_column).find("input").remove();
853
                            $(current_column).append("<input type='hidden' name='"+name+"' value='"+val+"' />");
864
                            $(current_column).append("<input type='hidden' name='"+name+"' value='"+val+"' />");
854
                        } else if ( i == 3 || i == 4 ) {
865
                        } else if ( i == 4 || i == 5 ) {
855
                            // If the value is not an integer for "Current checkouts allowed" or "Current on-site checkouts allowed"
866
                            // If the value is not an integer for "Current checkouts allowed" or "Current on-site checkouts allowed"
856
                            // The value is "Unlimited" (or an equivalent translated string)
867
                            // The value is "Unlimited" (or an equivalent translated string)
857
                            // an it should be set to an empty string
868
                            // an it should be set to an empty string
858
- 

Return to bug 12365