Bugzilla – Attachment 39318 Details for
Bug 13970
Remove related code to category_type
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED-OFF] Bug 13970: Remove category_type related code
SIGNED-OFF-Bug-13970-Remove-categorytype-related-c.patch (text/plain), 12.04 KB, created by
Bernardo Gonzalez Kriegel
on 2015-05-20 01:49:25 UTC
(
hide
)
Description:
[SIGNED-OFF] Bug 13970: Remove category_type related code
Filename:
MIME Type:
Creator:
Bernardo Gonzalez Kriegel
Created:
2015-05-20 01:49:25 UTC
Size:
12.04 KB
patch
obsolete
>From cc54dae856d19612b5f8d06b5ee6a7d1ddfdb647 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Wed, 8 Apr 2015 15:24:50 +0200 >Subject: [PATCH] [SIGNED-OFF] Bug 13970: Remove category_type related code > >Working on bug 13497 and bug 9314, I run into some Koha vestiges. >The category_type parameter should not be passed to memberentry. >On creating a new patron, the categorycode should be passed, and on >editing, it's useless. We can work with the borrowernumber and retrieve >these values. > >Details of the changes: >- members-toolbar.inc: Remove the category_type parameter passed to >memberentry.pl >- memberentrygen.tt: Just remove the useless category_type parameter on > editing a patron. Also remove the unused one passed to > guarantor_search.pl. >- tables/members_results.tt: the borrowernumber is enough to edit a > patron. >- memberentry.pl: check_categorytype is never used in the template, all > the process to calculate/retrieve it is unnecessary. >- members/nl-search.tt: The borrowernumber is enough to edit a patron. > >Test plan: >Try to create and edit patrons and verify that >- the guarantor search still work >- the form (memberentry) behave as before > >Edit a patron from the nl-search.pl script (Magnus?) > >Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> > >On top of 9314 (13497 already pushed) > >No evident regressions found, add/edit patron works, >search/set guarantor works. > >Cant test nl-patron.pl save for exec it. >prove -v t/NorwegianPatronDB.t runs > >No koha-qa errors >--- > .../prog/en/includes/members-toolbar.inc | 22 +++++++------------- > .../prog/en/modules/members/memberentrygen.tt | 10 ++++++--- > .../prog/en/modules/members/nl-search.tt | 8 +------ > .../en/modules/members/tables/members_results.tt | 2 +- > members/memberentry.pl | 9 -------- > 5 files changed, 16 insertions(+), 35 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc >index 828c564..70edbc0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc >@@ -130,30 +130,22 @@ function searchToHold(){ > > <div id="toolbar" class="btn-toolbar"> > [% IF ( CAN_user_borrowers ) %] >- [% IF ( category_type ) %] >- [% IF ( guarantor ) %] >- <a id="editpatron" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% borrowernumber %]&guarantorid=[% guarantorborrowernumber %]&category_type=[% category_type %]"> >- [% ELSE %] >- <a id="editpatron" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% borrowernumber %]&category_type=[% category_type %]"> >- [% END %] >- <i class="icon-pencil"></i> Edit</a> >- [% ELSE %] <!-- try with categorycode if no category_type --> >- [% IF ( categorycode ) %] >- <a id="editpatron" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% borrowernumber %]&categorycode=[% categorycode %]"><i class="icon-pencil"></i> Edit</a> >- [% ELSE %] <!-- if no categorycode, set category_type to A by default --> >- <a id="editpatron" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% borrowernumber %]&category_type=A"><i class="icon-pencil"></i> Edit</a> >- [% END %] >+ [% IF ( guarantor ) %] >+ <a id="editpatron" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% borrowernumber %]&guarantorid=[% guarantorborrowernumber %]&categorycode=[% categorycode %]"> >+ [% ELSE %] >+ <a id="editpatron" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% borrowernumber %]&categorycode=[% categorycode %]"> > [% END %] >+ <i class="icon-pencil"></i> Edit</a> > [% END %] > > [% IF ( CAN_user_borrowers ) %] > [% IF ( adultborrower AND activeBorrowerRelationship ) %] >- <a id="addchild" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=add&guarantorid=[% borrowernumber %]&category_type=C"><i class="icon-plus"></i> Add child</a> >+ <a id="addchild" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=add&guarantorid=[% borrowernumber %]"><i class="icon-plus"></i> Add child</a> > [% END %] > [% IF ( CAN_user_borrowers ) %] > <a id="changepassword" class="btn btn-small" href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]"><i class="icon-lock"></i> Change password</a> > [% END %] >- <a id="duplicate" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&borrowernumber=[% borrowernumber %]&category_type=[% category_type %]"><i class="icon-copy"></i>Duplicate</a> >+ <a id="duplicate" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&borrowernumber=[% borrowernumber %]&categorycode=[% categorycode %]"><i class="icon-copy"></i>Duplicate</a> > [% END %] > > <div class="btn-group"> >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 8dd0903..761a143 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >@@ -184,7 +184,11 @@ > <div class="dialog alert"> > <h3>Duplicate patron record?</h3> > <p><a class="popup" href="javascript:Dopop('moremember.pl?print=brief&borrowernumber=[% check_member %]');" >View existing record</a></p> >- <form action="/cgi-bin/koha/members/memberentry.pl" method="get"><input type="hidden" name="op" value="modify" /><input type="hidden" name="borrowernumber" value="[% check_member %]" /><input type="hidden" name="category_type" value="[% check_categorytype %]" /><input class="edit" type="submit" value="It is a duplicate. Edit existing record" /></form> >+ <form action="/cgi-bin/koha/members/memberentry.pl" method="get"> >+ <input type="hidden" name="op" value="modify" /> >+ <input type="hidden" name="borrowernumber" value="[% check_member %]" /> >+ <input class="edit" type="submit" value="It is a duplicate. Edit existing record" /> >+ </form> > > <form name="form_double" action="/cgi-bin/koha/members/memberentry.pl" method="post" autocomplete="off"> > <input type="hidden" name="nodouble" value="1" /> >@@ -459,9 +463,9 @@ > <li> > <span class="label"> </span> > [% IF ( guarantorid ) %] >- <input id="guarantorsearch" type="button" value="Change" onclick="Dopopguarantor('guarantor_search.pl?category_type=[% category_type %]');" /> >+ <input id="guarantorsearch" type="button" value="Change" onclick="Dopopguarantor('guarantor_search.pl');" /> > [% ELSE %] >- <input id="guarantorsearch" type="button" value="Set to patron" onclick="Dopopguarantor('guarantor_search.pl?category_type=[% category_type %]');" /> >+ <input id="guarantorsearch" type="button" value="Set to patron" onclick="Dopopguarantor('guarantor_search.pl');" /> > [% END %] > <input id="guarantordelete" type="button" value="Delete" /> > </li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/nl-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/nl-search.tt >index a3629ad..b8a9791 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/nl-search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/nl-search.tt >@@ -32,15 +32,9 @@ > <h3>Existing patrons</h3> > <ul> > [% FOREACH patron IN local_result %] >- [%# Find the category_type %] >- [% FOREACH category IN categories %] >- [% IF category.categorycode == patron.categorycode %] >- [% patron.category_type = category.category_type %] >- [% END %] >- [% END %] > <li>[% patron.firstname %] [% patron.surname %] [% patron.cardnumber %] | > <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">Details</a> | >- <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% patron.borrowernumber %]&category_type=[% patron.category_type %]">Edit</a> | >+ <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% patron.borrowernumber %]">Edit</a> | > <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% patron.borrowernumber %]">Check out</a> > </li> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt >index f4dcc61..e4b7337 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt >@@ -28,7 +28,7 @@ > "dt_borrowernotes": > "[% data.borrowernotes.replace('\\\\' , '\\\\') |html |html_line_break |collapse %]", > "dt_action": >- "[% IF data.category_type %]<a href='/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% data.borrowernumber %]&category_type=[% data.category_type %]'>Edit</a>[% ELSE %][% IF data.categorycode %]<a href='/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% data.borrowernumber %]&categorycode=[% data.categorycode %]'>Edit</a>[% ELSE %]<a href='/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% data.borrowernumber %]&category_type=A'>Edit</a>[% END %][% END %]", >+ "<a href='/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% data.borrowernumber %]'>Edit</a>", > "borrowernumber": > "[% data.borrowernumber %]" > }[% UNLESS loop.last %],[% END %] >diff --git a/members/memberentry.pl b/members/memberentry.pl >index 3de7d75..4d5e948 100755 >--- a/members/memberentry.pl >+++ b/members/memberentry.pl >@@ -90,8 +90,6 @@ my $guarantorinfo = $input->param('guarantorinfo'); > my $step = $input->param('step') || 0; > my @errors; > my $default_city; >-# $check_categorytype contains the value of duplicate borrowers category type to redirect in good template in step =2 >-my $check_categorytype=$input->param('check_categorytype'); > # NOTE: Alert for ethnicity and ethnotes fields, they are invalid in all borrowers form > my $borrower_data; > my $NoUpdateLogin; >@@ -239,12 +237,6 @@ if ( ( $op eq 'insert' ) and !$nodouble ) { > if ( !$check_member ) { > $nodouble = 1; > } >- >- # recover the category type if the borrowers is a doublon >- if ($check_category) { >- my $tmpborrowercategory = GetBorrowercategory($check_category); >- $check_categorytype = $tmpborrowercategory->{'category_type'}; >- } > } > > #recover all data from guarantor address phone ,fax... >@@ -713,7 +705,6 @@ $template->param( > borrotitlepopup => $borrotitlepopup, > guarantorinfo => $guarantorinfo, > flagloop => \@flagdata, >- check_categorytype =>$check_categorytype,#to recover the category type with checkcategorytype function > category_type =>$category_type, > modify => $modify, > nok => $nok,#flag to konw if an error >-- >1.7.9.5
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 13970
:
37578
|
39318
|
39956