From d9244330d74504ad08c124bf840e1ac0f096b5c3 Mon Sep 17 00:00:00 2001 From: David Cook <dcook@prosentient.com.au> Date: Mon, 6 Jan 2014 14:43:53 +1100 Subject: [PATCH] Bug 11473 - Remove boilerplate in log viewer template This patch eliminates unnecessary conditions and boilerplate. _TEST PLAN_ Apply the patch. 1) Try viewing logs for circulation, patrons, fines, cataloguines, serials, authorities, etc. 2) Note that everything should look exactly the same as before, with one exception: FINES 3) Fines will now show "member X" for the user associated with the fine. Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> --- koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt index ccd7cb6..a16585e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt @@ -127,25 +127,14 @@ <tr> <td>[% loopro.timestamp %]</td> <td> - [% IF ( loopro.module == 'CIRCULATION' ) %] - <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.user %]" title="display detail for this user."> [% loopro.user %] </a> - [% ELSE %] <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.user %]" title="display detail for this librarian."> [% loopro.user %] </a> - [% END %] </td> <td>[% loopro.module %]</td> <td>[% loopro.action %]</td> <td> - [% IF ( loopro.module == 'MEMBERS' ) %] - <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.object %]" title="Display member details."> member [% loopro.object %] </a> + [% IF ( loopro.module == 'MEMBERS' ) || ( loopro.module == 'CIRCULATION' ) || ( loopro.module == 'FINES' ) %] + <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.object %]" title="Display member details."> [% IF ( loopro.object ) %]member [% loopro.object %][% END %] </a> [% ELSE %] - [% IF ( loopro.module == 'CIRCULATION' ) %] - <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.object %]" title="Display member details."> - [% IF ( loopro.object ) %] - member [% loopro.object %] - [% END %] - </a> - [% ELSE %] [% IF ( loopro.module == 'CATALOGUING' ) %] [% IF ( loopro.info.substr(0, 4) == 'item' ) %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?item=[% loopro.object %]&biblionumber=[% loopro.biblionumber %]&bi=[% loopro.biblioitemnumber %]#item[% loopro.object %]">Item [% loopro.object %]</a> @@ -165,7 +154,6 @@ [% END %] [% END %] [% END %] - [% END %] [% END %] </td> <td> -- 1.8.5.2