Bugzilla – Attachment 53152 Details for
Bug 3534
Patron quick add form
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 3534 - (QA Followup) Use single toolbar for regular/quickadd forms
Bug-3534---QA-Followup-Use-single-toolbar-for-regu.patch (text/plain), 5.41 KB, created by
Nick Clemens
on 2016-07-06 19:08:35 UTC
(
hide
)
Description:
Bug 3534 - (QA Followup) Use single toolbar for regular/quickadd forms
Filename:
MIME Type:
Creator:
Nick Clemens
Created:
2016-07-06 19:08:35 UTC
Size:
5.41 KB
patch
obsolete
>From bd1fb2ad6850274ea42653c325ef7c37103d618a Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >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 %] > > >+<div id="toolbar" class="btn-toolbar"> >+[% UNLESS ( check_member ) %] >+ [% IF quickadd && opadd %] >+ <button class="btn btn-small toggler" id="save_quick_add" name="save"><i class="fa fa-save"></i> Save</button> >+ [% END %] >+ <button class="btn btn-small toggler" id="saverecord" name="save" ><i class="fa fa-save"></i> Save</button> >+ [% IF opadd %] >+ <a class="btn btn-small" href="/cgi-bin/koha/members/member.pl" class="toggler save_entryform"> >+ [% ELSE %] >+ <a class="btn btn-small" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]"> >+ [% END %] >+ <i class="fa fa-times"></i> Cancel >+ </a> >+[% END %] >+</div> >+ > [% UNLESS ( check_member ) %]<form name="form" id="entryform" action="/cgi-bin/koha/members/memberentry.pl" method="post" autocomplete="off" class="toggler" > > <input type="hidden" name="nodouble" value="[% nodouble %]" /> [% END %] > <!-- field always hidden in different form (1,2,3) --> >@@ -224,18 +246,6 @@ $(document).ready(function() { > [% END %] > [% END %] > [% END %] >-<div id="toolbar" class="btn-toolbar"> >-[% UNLESS ( check_member ) %] >- <button class="btn btn-small" id="saverecord" type="submit" name="save" onclick="return check_form_borrowers();"><i class="fa fa-save"></i> Save</button> >- [% IF opadd %] >- <a class="btn btn-small" href="/cgi-bin/koha/members/member.pl"> >- [% ELSE %] >- <a class="btn btn-small" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]"> >- [% END %] >- <i class="fa fa-times"></i> Cancel >- </a> >-[% END %] >-</div> > > [% IF ( step_1 ) %] > [%UNLESS notitle && nosurname && nofirstname && nodateofbirth && noinitials && noothernames &&nosex %] >@@ -1092,12 +1102,6 @@ $(document).ready(function() { > > [% IF quickadd && opadd && !check_member %] > <form id="quick_add_form" class="toggler"> >- <div id="qa_toolbar" class="btn-toolbar"> >- <button class="btn btn-small" id="save_quick_add" name="save"><i class="fa fa-save"></i> Save</button> >- <a class="btn btn-small" href="/cgi-bin/koha/members/member.pl"> >- <i class="fa fa-times"></i> Cancel >- </a> >- </div> > <fieldset class="rows quick_add"><legend>Quick add</legend> > <ol id="quick_add_list"> > </ol> >@@ -1105,7 +1109,7 @@ $(document).ready(function() { > </form> > <script> > $(document).ready(function () { >- $("#entryform").hide(); >+ $("#entryform,#saverecord").hide(); > [% q_add_f = Koha.Preference('PatronQuickAddFields').split('\|') %] > var qaddfields = [[% FOREACH field IN q_add_f.unique %]"[% field %]",[% END %]]; > var skipped_fields = ["contactname","contactfirstname","relationship"]; //Guarantor form is pulled as a whole, ignore individual fields >@@ -1127,19 +1131,6 @@ $(document).ready(function() { > $("#memberentry_guarantor").clone().appendTo("#quick_add_list").css("margin",0); > } > $("#quick_add_form").show(); >- var qa_original_offset = $("#qa_toolbar").position().top; >- var qa_additional_height = $("#qa_filters").height(); >- $('#qa_toolbar').fixFloat({ 'originalOffset': qa_original_offset - qa_additional_height }); >- $("#filteraction_on").on("click", function(){ >- $(window).off('scroll'); >- $("#qa_toolbar").css({ top: qa_original_offset }); >- $('#qa_toolbar').fixFloat({ 'originalOffset': qa_original_offset }); >- }); >- $("#filteraction_off").on("click", function(){ >- $(window).off('scroll'); >- $("#qa_toolbar").css({ top: qa_original_offset - qa_additional_height}); >- $('#qa_toolbar').fixFloat({ 'originalOffset': qa_original_offset - qa_additional_height }); >- }) > }); > </script> > [% END %] >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 3534
:
1396
|
50090
|
50091
|
50092
|
50093
|
50362
|
50410
|
50413
|
50414
|
50665
|
50666
|
50729
|
51382
|
51389
|
51445
|
51446
|
51960
|
51961
|
52192
|
52584
|
52585
|
52586
|
52934
|
52935
|
52936
|
52937
|
53109
|
53152
|
53171
|
53172
|
53173
|
53174
|
53175
|
84851