From 5b3535899acfdcd309d722dba39a8bdcdbdc54e4 Mon Sep 17 00:00:00 2001 From: David Cook 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 Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton --- .../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 ccd7cb64de..a16585e15a 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 @@ [% loopro.timestamp %] - [% IF ( loopro.module == 'CIRCULATION' ) %] - [% loopro.user %] - [% ELSE %] [% loopro.user %] - [% END %] [% loopro.module %] [% loopro.action %] - [% IF ( loopro.module == 'MEMBERS' ) %] - member [% loopro.object %] + [% IF ( loopro.module == 'MEMBERS' ) || ( loopro.module == 'CIRCULATION' ) || ( loopro.module == 'FINES' ) %] + [% IF ( loopro.object ) %]member [% loopro.object %][% END %] [% ELSE %] - [% IF ( loopro.module == 'CIRCULATION' ) %] - - [% IF ( loopro.object ) %] - member [% loopro.object %] - [% END %] - - [% ELSE %] [% IF ( loopro.module == 'CATALOGUING' ) %] [% IF ( loopro.info.substr(0, 4) == 'item' ) %] Item [% loopro.object %] @@ -165,7 +154,6 @@ [% END %] [% END %] [% END %] - [% END %] [% END %] -- 2.39.5