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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt (-7 / +17 lines)
Lines 70-75 Link Here
70
                <th>Patron category</th>
70
                <th>Patron category</th>
71
                <th>Item type</th>
71
                <th>Item type</th>
72
                <th>Actions</th>
72
                <th>Actions</th>
73
                <th>Note</th>
73
                <th>Current checkouts allowed</th>
74
                <th>Current checkouts allowed</th>
74
                <th>Current on-site checkouts allowed</th>
75
                <th>Current on-site checkouts allowed</th>
75
                <th>Loan period</th>
76
                <th>Loan period</th>
Lines 97-103 Link Here
97
                <th>Item level holds</th>
98
                <th>Item level holds</th>
98
                <th>Article requests</th>
99
                <th>Article requests</th>
99
                <th>Rental discount (%)</th>
100
                <th>Rental discount (%)</th>
100
                <th>Note</th>
101
                <th>Actions</th>
101
                <th>Actions</th>
102
            </tr>
102
            </tr>
103
            </thead>
103
            </thead>
Lines 121-126 Link Here
121
                                                          <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>
121
                                                          <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>
122
                                                        </td>
122
                                                        </td>
123
123
124
                                                        <td>
125
                                                            [% IF rule.note %]
126
                                                                <a name="viewnote" data-toggle="popover" title="Note" data-content="[% rule.note %]" data-placement="top" data-trigger="hover">View note</a>
127
                                                            [% ELSE %]&nbsp;[% END %]
128
                                                        </td>
124
							<td>[% IF ( rule.unlimited_maxissueqty ) %]
129
							<td>[% IF ( rule.unlimited_maxissueqty ) %]
125
									<span>Unlimited</span>
130
									<span>Unlimited</span>
126
								[% ELSE %]
131
								[% ELSE %]
Lines 254-259 Link Here
254
                        <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button>
259
                        <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button>
255
                        <button name="cancel" class="clear_edit btn btn-default btn-xs"><i class="fa fa-undo"></i> Clear</button>
260
                        <button name="cancel" class="clear_edit btn btn-default btn-xs"><i class="fa fa-undo"></i> Clear</button>
256
                    </td>
261
                    </td>
262
                    <td><input type="text" name="note" id="note" size="15" value="" maxlength="100"></td>
257
                    <td><input type="text" name="maxissueqty" id="maxissueqty" size="3" /></td>
263
                    <td><input type="text" name="maxissueqty" id="maxissueqty" size="3" /></td>
258
                    <td><input type="text" name="maxonsiteissueqty" id="maxonsiteissueqty" size="3" /></td>
264
                    <td><input type="text" name="maxonsiteissueqty" id="maxonsiteissueqty" size="3" /></td>
259
                    <td><input type="text" name="issuelength" id="issuelength" size="3" /> </td>
265
                    <td><input type="text" name="issuelength" id="issuelength" size="3" /> </td>
Lines 326-332 Link Here
326
                        </select>
332
                        </select>
327
                    </td>
333
                    </td>
328
                    <td><input type="text" name="rentaldiscount" id="rentaldiscount" size="2" /></td>
334
                    <td><input type="text" name="rentaldiscount" id="rentaldiscount" size="2" /></td>
329
                    <td><input type="text" name="note" id="note" size="15" value=""></td>
330
                    <td class="actions">
335
                    <td class="actions">
331
                        <input type="hidden" name="branch" value="[% current_branch | html %]"/>
336
                        <input type="hidden" name="branch" value="[% current_branch | html %]"/>
332
                        <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button>
337
                        <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button>
Lines 338-343 Link Here
338
                      <th>Patron category</th>
343
                      <th>Patron category</th>
339
                      <th>Item type</th>
344
                      <th>Item type</th>
340
                      <th>&nbsp;</th>
345
                      <th>&nbsp;</th>
346
                      <th>Note</th>
341
                      <th>Current checkouts allowed</th>
347
                      <th>Current checkouts allowed</th>
342
                      <th>Current on-site checkouts allowed</th>
348
                      <th>Current on-site checkouts allowed</th>
343
                      <th>Loan period</th>
349
                      <th>Loan period</th>
Lines 365-371 Link Here
365
                      <th>Item level holds</th>
371
                      <th>Item level holds</th>
366
                      <th>Article requests</th>
372
                      <th>Article requests</th>
367
                      <th>Rental discount (%)</th>
373
                      <th>Rental discount (%)</th>
368
                      <th>Note</th>
369
                      <th>&nbsp;</th>
374
                      <th>&nbsp;</th>
370
                    </tr>
375
                    </tr>
371
                  </tfoot>
376
                  </tfoot>
Lines 797-802 Link Here
797
        var MSG_CONFIRM_DELETE = _("Are you sure you want to delete this rule? This cannot be undone.");
802
        var MSG_CONFIRM_DELETE = _("Are you sure you want to delete this rule? This cannot be undone.");
798
803
799
        $(document).ready(function() {
804
        $(document).ready(function() {
805
            $('[data-toggle="popover"]').popover();
806
800
            $(".delete").on("click",function(){
807
            $(".delete").on("click",function(){
801
                return confirmDelete(MSG_CONFIRM_DELETE);
808
                return confirmDelete(MSG_CONFIRM_DELETE);
802
            });
809
            });
Lines 834-840 Link Here
834
                    itm = $(this).text();
841
                    itm = $(this).text();
835
                    itm = itm.replace(/^\s*|\s*$/g,'');
842
                    itm = itm.replace(/^\s*|\s*$/g,'');
836
                    var current_column = $("#edit_row td:eq("+i+")");
843
                    var current_column = $("#edit_row td:eq("+i+")");
837
                    if ( i == 7 ) {
844
                    if ( i == 3 ) {
845
                        // specific processing for the Note column
846
                        var note = $(this).find("a[name='viewnote']").data("content");
847
                        $(current_column).find("input[type='text']").val(note);
848
                    } else if ( i == 8 ) {
838
                        // specific processing for the Hard due date column
849
                        // specific processing for the Hard due date column
839
                        var select_value = $(this).find("input[type='hidden'][name='hardduedatecomparebackup']").val();
850
                        var select_value = $(this).find("input[type='hidden'][name='hardduedatecomparebackup']").val();
840
                        var input_value = '';
851
                        var input_value = '';
Lines 845-851 Link Here
845
                        }
856
                        }
846
                        $(current_column).find("input[type='text']").val(input_value);
857
                        $(current_column).find("input[type='text']").val(input_value);
847
                        $(current_column).find("select").val(select_value);
858
                        $(current_column).find("select").val(select_value);
848
                    } else if ( i == 13 ) {
859
                    } else if ( i == 14 ) {
849
                        // specific processing for cap_fine_to_replacement_price
860
                        // specific processing for cap_fine_to_replacement_price
850
                        var cap_fine_to_replacement_price = $(this).find("input[type='checkbox']");
861
                        var cap_fine_to_replacement_price = $(this).find("input[type='checkbox']");
851
                        $('#cap_fine_to_replacement_price').prop('checked', cap_fine_to_replacement_price.is(':checked') );
862
                        $('#cap_fine_to_replacement_price').prop('checked', cap_fine_to_replacement_price.is(':checked') );
Lines 870-876 Link Here
870
                            // Remove potential previous input added
881
                            // Remove potential previous input added
871
                            $(current_column).find("input").remove();
882
                            $(current_column).find("input").remove();
872
                            $(current_column).append("<input type='hidden' name='"+name+"' value='"+val+"' />");
883
                            $(current_column).append("<input type='hidden' name='"+name+"' value='"+val+"' />");
873
                        } else if ( i == 3 || i == 4 || i == 24 ) {
884
                        } else if ( i == 4 || i == 5 || i == 25 ) {
874
                            // If the value is not an integer for
885
                            // If the value is not an integer for
875
                            //     - "Current checkouts allowed"
886
                            //     - "Current checkouts allowed"
876
                            //     - "Current on-site checkouts allowed"
887
                            //     - "Current on-site checkouts allowed"
877
- 

Return to bug 12365