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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt (-9 / +18 lines)
Lines 66-71 Link Here
66
                <th>Patron category</th>
66
                <th>Patron category</th>
67
                <th>Item type</th>
67
                <th>Item type</th>
68
                <th>Actions</th>
68
                <th>Actions</th>
69
                <th>Note</th>
69
                <th>Current checkouts allowed</th>
70
                <th>Current checkouts allowed</th>
70
                <th>Current on-site checkouts allowed</th>
71
                <th>Current on-site checkouts allowed</th>
71
                <th>Loan period</th>
72
                <th>Loan period</th>
Lines 92-98 Link Here
92
                <th>Item level holds</th>
93
                <th>Item level holds</th>
93
                <th>Article requests</th>
94
                <th>Article requests</th>
94
                <th>Rental discount (%)</th>
95
                <th>Rental discount (%)</th>
95
                <th>Note</th>
96
                <th>Actions</th>
96
                <th>Actions</th>
97
            </tr>
97
            </tr>
98
            </thead>
98
            </thead>
Lines 116-121 Link Here
116
                                                          <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&amp;itemtype=[% rule.itemtype %]&amp;categorycode=[% rule.categorycode %]&amp;branch=[% rule.current_branch %]"><i class="fa fa-trash"></i> Delete</a>
116
                                                          <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&amp;itemtype=[% rule.itemtype %]&amp;categorycode=[% rule.categorycode %]&amp;branch=[% rule.current_branch %]"><i class="fa fa-trash"></i> Delete</a>
117
                                                        </td>
117
                                                        </td>
118
118
119
                                                        <td>
120
                                                            [% IF rule.note %]
121
                                                                <a name="viewnote" data-toggle="popover" title="Note" data-content="[% rule.note %]" data-placement="top" data-trigger="hover">View note</a>
122
                                                            [% ELSE %]&nbsp;[% END %]
123
                                                        </td>
119
							<td>[% IF ( rule.unlimited_maxissueqty ) %]
124
							<td>[% IF ( rule.unlimited_maxissueqty ) %]
120
									<span>Unlimited</span>
125
									<span>Unlimited</span>
121
								[% ELSE %]
126
								[% ELSE %]
Lines 213-219 Link Here
213
                                                            [% END %]
218
                                                            [% END %]
214
                                                        </td>
219
                                                        </td>
215
							<td>[% rule.rentaldiscount %]</td>
220
							<td>[% rule.rentaldiscount %]</td>
216
            <td>[% rule.note %]</td>
217
                                                        <td class="actions">
221
                                                        <td class="actions">
218
                                                          <a href="#" class="editrule btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
222
                                                          <a href="#" class="editrule btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
219
                                                          <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&amp;itemtype=[% rule.itemtype %]&amp;categorycode=[% rule.categorycode %]&amp;branch=[% rule.current_branch %]"><i class="fa fa-trash"></i> Delete</a>
223
                                                          <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&amp;itemtype=[% rule.itemtype %]&amp;categorycode=[% rule.categorycode %]&amp;branch=[% rule.current_branch %]"><i class="fa fa-trash"></i> Delete</a>
Lines 243-248 Link Here
243
                        <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button>
247
                        <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button>
244
                        <button name="cancel" class="clear_edit btn btn-default btn-xs"><i class="fa fa-undo"></i> Clear</button>
248
                        <button name="cancel" class="clear_edit btn btn-default btn-xs"><i class="fa fa-undo"></i> Clear</button>
245
                    </td>
249
                    </td>
250
                    <td><input type="text" name="note" id="note" size="15" value="" maxlength="100"></td>
246
                    <td><input type="text" name="maxissueqty" id="maxissueqty" size="3" /></td>
251
                    <td><input type="text" name="maxissueqty" id="maxissueqty" size="3" /></td>
247
                    <td><input type="text" name="maxonsiteissueqty" id="maxonsiteissueqty" size="3" /></td>
252
                    <td><input type="text" name="maxonsiteissueqty" id="maxonsiteissueqty" size="3" /></td>
248
                    <td><input type="text" name="issuelength" id="issuelength" size="3" /> </td>
253
                    <td><input type="text" name="issuelength" id="issuelength" size="3" /> </td>
Lines 314-320 Link Here
314
                        </select>
319
                        </select>
315
                    </td>
320
                    </td>
316
                    <td><input type="text" name="rentaldiscount" id="rentaldiscount" size="2" /></td>
321
                    <td><input type="text" name="rentaldiscount" id="rentaldiscount" size="2" /></td>
317
                    <td><input type="text" name="note" id="note" size="15" value=""></td>
318
                    <td class="actions">
322
                    <td class="actions">
319
                        <input type="hidden" name="branch" value="[% current_branch %]"/>
323
                        <input type="hidden" name="branch" value="[% current_branch %]"/>
320
                        <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button>
324
                        <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button>
Lines 326-331 Link Here
326
                      <th>Patron category</th>
330
                      <th>Patron category</th>
327
                      <th>Item type</th>
331
                      <th>Item type</th>
328
                      <th>&nbsp;</th>
332
                      <th>&nbsp;</th>
333
                      <th>Note</th>
329
                      <th>Current checkouts allowed</th>
334
                      <th>Current checkouts allowed</th>
330
                      <th>Current on-site checkouts allowed</th>
335
                      <th>Current on-site checkouts allowed</th>
331
                      <th>Loan period</th>
336
                      <th>Loan period</th>
Lines 345-358 Link Here
345
                      <th>No renewal before</th>
350
                      <th>No renewal before</th>
346
                      <th>Automatic renewal</th>
351
                      <th>Automatic renewal</th>
347
                      <th>No automatic renewal after</th>
352
                      <th>No automatic renewal after</th>
348
                       <th>No automatic renewal after (hard limit)</th>
353
                      <th>No automatic renewal after (hard limit)</th>
349
                      <th>Holds allowed (count)</th>
354
                      <th>Holds allowed (count)</th>
350
                      <th>Holds per record (count)</th>
355
                      <th>Holds per record (count)</th>
351
                      <th>On shelf holds allowed</th>
356
                      <th>On shelf holds allowed</th>
352
                      <th>Item level holds</th>
357
                      <th>Item level holds</th>
353
                      <th>Article requests</th>
358
                      <th>Article requests</th>
354
                      <th>Rental discount (%)</th>
359
                      <th>Rental discount (%)</th>
355
                      <th>Note</th>
356
                      <th>&nbsp;</th>
360
                      <th>&nbsp;</th>
357
                    </tr>
361
                    </tr>
358
                  </tfoot>
362
                  </tfoot>
Lines 767-772 Link Here
767
        var MSG_CONFIRM_DELETE = _("Are you sure you want to delete this rule? This cannot be undone.");
771
        var MSG_CONFIRM_DELETE = _("Are you sure you want to delete this rule? This cannot be undone.");
768
772
769
        $(document).ready(function() {
773
        $(document).ready(function() {
774
            $('[data-toggle="popover"]').popover();
775
770
            $(".delete").on("click",function(){
776
            $(".delete").on("click",function(){
771
                return confirmDelete(MSG_CONFIRM_DELETE);
777
                return confirmDelete(MSG_CONFIRM_DELETE);
772
            });
778
            });
Lines 804-810 Link Here
804
                    itm = $(this).text();
810
                    itm = $(this).text();
805
                    itm = itm.replace(/^\s*|\s*$/g,'');
811
                    itm = itm.replace(/^\s*|\s*$/g,'');
806
                    var current_column = $("#edit_row td:eq("+i+")");
812
                    var current_column = $("#edit_row td:eq("+i+")");
807
                    if ( i == 7 ) {
813
                    if ( i == 3 ) {
814
                        // specific processing for the Note column
815
                        var note = $(this).find("a[name='viewnote']").data("content");
816
                        $(current_column).find("input[type='text']").val(note);
817
                    } else if ( i == 8 ) {
808
                        // specific processing for the Hard due date column
818
                        // specific processing for the Hard due date column
809
                        var select_value = $(this).find("input[type='hidden'][name='hardduedatecomparebackup']").val();
819
                        var select_value = $(this).find("input[type='hidden'][name='hardduedatecomparebackup']").val();
810
                        var input_value = '';
820
                        var input_value = '';
Lines 815-821 Link Here
815
                        }
825
                        }
816
                        $(current_column).find("input[type='text']").val(input_value);
826
                        $(current_column).find("input[type='text']").val(input_value);
817
                        $(current_column).find("select").val(select_value);
827
                        $(current_column).find("select").val(select_value);
818
                    } else if ( i == 13 ) {
828
                    } else if ( i == 14 ) {
819
                        // specific processing for cap_fine_to_replacement_price
829
                        // specific processing for cap_fine_to_replacement_price
820
                        var cap_fine_to_replacement_price = $(this).find("input[type='checkbox']");
830
                        var cap_fine_to_replacement_price = $(this).find("input[type='checkbox']");
821
                        $('#cap_fine_to_replacement_price').prop('checked', cap_fine_to_replacement_price.is(':checked') );
831
                        $('#cap_fine_to_replacement_price').prop('checked', cap_fine_to_replacement_price.is(':checked') );
Lines 840-846 Link Here
840
                            // Remove potential previous input added
850
                            // Remove potential previous input added
841
                            $(current_column).find("input").remove();
851
                            $(current_column).find("input").remove();
842
                            $(current_column).append("<input type='hidden' name='"+name+"' value='"+val+"' />");
852
                            $(current_column).append("<input type='hidden' name='"+name+"' value='"+val+"' />");
843
                        } else if ( i == 3 || i == 4 ) {
853
                        } else if ( i == 4 || i == 5 ) {
844
                            // If the value is not an integer for "Current checkouts allowed" or "Current on-site checkouts allowed"
854
                            // If the value is not an integer for "Current checkouts allowed" or "Current on-site checkouts allowed"
845
                            // The value is "Unlimited" (or an equivalent translated string)
855
                            // The value is "Unlimited" (or an equivalent translated string)
846
                            // an it should be set to an empty string
856
                            // an it should be set to an empty string
847
- 

Return to bug 12365