c345694808
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 Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
44 lines
2.6 KiB
Text
44 lines
2.6 KiB
Text
[% USE To %]
|
|
[% USE AuthorisedValues %]
|
|
{
|
|
"sEcho": [% sEcho %],
|
|
"iTotalRecords": [% iTotalRecords %],
|
|
"iTotalDisplayRecords": [% iTotalDisplayRecords %],
|
|
"aaData": [
|
|
[% FOREACH data IN aaData %]
|
|
{
|
|
[% IF CAN_user_tools_manage_patron_lists %]
|
|
"dt_borrowernumber":
|
|
"<input type='checkbox' class='selection' name='borrowernumber' value='[% data.borrowernumber %]' />",
|
|
[% END %]
|
|
"dt_cardnumber":
|
|
"[% data.cardnumber | html %]",
|
|
"dt_name":
|
|
"<span style='white-space:nowrap'><a href='/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber %]'>[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = data.firstname surname = data.surname othernames = data.othernames invert_name = 1 %]</a><br />[% INCLUDE escape_address data = data %]</span>",
|
|
"dt_category":
|
|
"[% data.category_description |html %] ([% data.category_type |html %])",
|
|
"dt_branch":
|
|
"[% data.branchname |html %]",
|
|
"dt_dateexpiry":
|
|
"[% data.dateexpiry %]",
|
|
"dt_od_checkouts":
|
|
"[% IF data.overdues %]<span class='overdue'><strong>[% data.overdues %]</strong></span>[% ELSE %][% data.overdues %][% END %] / [% data.issues %]",
|
|
"dt_fines":
|
|
"[% IF data.fines < 0 %]<span class='credit'>[% data.fines |html %]</span> [% ELSIF data.fines > 0 %] <span class='debit'><strong>[% data.fines |html %]</strong></span> [% ELSE %] [% data.fines |html%] [% END %]</td>",
|
|
"dt_borrowernotes":
|
|
"[% data.borrowernotes.replace('\\\\' , '\\\\') |html |html_line_break |collapse %]",
|
|
"dt_action":
|
|
"<a href='/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% data.borrowernumber %]'>Edit</a>",
|
|
"borrowernumber":
|
|
"[% data.borrowernumber %]"
|
|
}[% UNLESS loop.last %],[% END %]
|
|
[% END %]
|
|
]
|
|
}
|
|
[% BLOCK escape_address %]
|
|
[%~ SET address = data.streetnumber _ ' ' %]
|
|
[%~ IF data.streettype %][% address = address _ AuthorisedValues.GetByCode( 'ROADTYPE', data.streettype ) _ ' ' %][% END %]
|
|
[%~ IF data.address %][% address = address _ data.address _ ' ' %][% END %]
|
|
[%~ IF data.address2 %][% address = address _ data.address2 _ ' ' %][% END %]
|
|
[%~ To.json( address ) ~%]
|
|
[% END %]
|