From bd1fb2ad6850274ea42653c325ef7c37103d618a Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Wed, 6 Jul 2016 15:06:56 -0400 Subject: [PATCH] Bug 3534 - (QA Followup) Use single toolbar for regular/quickadd forms --- .../prog/en/modules/members/memberentrygen.tt | 57 +++++++++------------- 1 file changed, 24 insertions(+), 33 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index 27d4b84..0915c6b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -44,6 +44,7 @@ $(document).ready(function() { if( $("#entryform:visible").length ) { toggle_to = "#quick_add_form label"; toggle_from = "#entryform label"; + } else { toggle_to="#entryform label"; toggle_from = "#quick_add_form label"; @@ -66,10 +67,15 @@ $(document).ready(function() { $("#quick_add_form").validate(); if( $("#quick_add_form").valid()){ $('.toggle_quick_add').click(); - $('#entryform button[name="save"]').click(); + $('#saverecord').click(); } else {return false;} }); + $("#saverecord").click(function(){ + if( check_form_borrowers() ){ + $("#entryform").submit(); + } + }); }); @@ -201,6 +207,22 @@ $(document).ready(function() { [% END %] +
+[% UNLESS ( check_member ) %] + [% IF quickadd && opadd %] + + [% END %] + + [% IF opadd %] + + [% ELSE %] + + [% END %] + Cancel + +[% END %] +
+ [% UNLESS ( check_member ) %]
[% END %] @@ -224,18 +246,6 @@ $(document).ready(function() { [% END %] [% END %] [% END %] -
-[% UNLESS ( check_member ) %] - - [% IF opadd %] - - [% ELSE %] - - [% END %] - Cancel - -[% END %] -
[% IF ( step_1 ) %] [%UNLESS notitle && nosurname && nofirstname && nodateofbirth && noinitials && noothernames &&nosex %] @@ -1092,12 +1102,6 @@ $(document).ready(function() { [% IF quickadd && opadd && !check_member %] -
- - - Cancel - -
Quick add
@@ -1105,7 +1109,7 @@ $(document).ready(function() { [% END %] -- 2.1.4