From ef946da09b3728c05a12f750d7edb57bc37f1493 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Wed, 4 Jul 2018 00:12:21 +0000 Subject: [PATCH] Bug 12365: (follow-up) Adding maxlength attribute and popover Test that you can't add a note of more than 100 characters. Test notes with rules, notes are hidden by 'View note' and the popover correctly displays note. View the note by hovering over the link I've moved the Note column so the popover displays nicely and doesn't cover the buttons. I've also changed the placement so that it doesn't cover information in the row. --- .../intranet-tmpl/prog/en/modules/admin/smart-rules.tt | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt index 0a10714..7e0e788 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt @@ -66,6 +66,7 @@ Patron category Item type Actions + Note Current checkouts allowed Current on-site checkouts allowed Loan period @@ -92,7 +93,6 @@ Item level holds Article requests Rental discount (%) - Note Actions @@ -116,6 +116,11 @@ Delete + + [% IF rule.note %] + View note + [% ELSE %] [% END %] + [% IF ( rule.unlimited_maxissueqty ) %] Unlimited [% ELSE %] @@ -213,7 +218,6 @@ [% END %] [% rule.rentaldiscount %] - [% rule.note %] Edit Delete @@ -243,6 +247,7 @@ + @@ -314,7 +319,6 @@ - @@ -326,6 +330,7 @@ Patron category Item type   + Note Current checkouts allowed Current on-site checkouts allowed Loan period @@ -345,14 +350,13 @@ No renewal before Automatic renewal No automatic renewal after - No automatic renewal after (hard limit) + No automatic renewal after (hard limit) Holds allowed (count) Holds per record (count) On shelf holds allowed Item level holds Article requests Rental discount (%) - Note   @@ -767,6 +771,8 @@ var MSG_CONFIRM_DELETE = _("Are you sure you want to delete this rule? This cannot be undone."); $(document).ready(function() { + $('[data-toggle="popover"]').popover(); + $(".delete").on("click",function(){ return confirmDelete(MSG_CONFIRM_DELETE); }); -- 2.1.4