diff --git a/C4/Log.pm b/C4/Log.pm index 98cd8d5f1c..6b8ff17e45 100644 --- a/C4/Log.pm +++ b/C4/Log.pm @@ -4,6 +4,7 @@ package C4::Log; # Copyright 2000-2002 Katipo Communications +# Copyright 2011 MJ Ray and software.coop # # This file is part of Koha. # @@ -217,7 +218,7 @@ sub GetLogs { $query .= " AND user = ? "; push(@parameters,$user); } - if(scalar @$modules > 1 or @$modules[0] ne "") { + if($modules && scalar(@$modules)) { $query .= " AND module IN (".join(",",map {"?"} @$modules).") "; push(@parameters,@$modules); } 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 c109744b9a..f20569d3fc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt @@ -59,11 +59,11 @@
| Date | -Librarian | -Module | -Action | -Object | -Info | -
|---|---|---|---|---|---|
| [% loopro.timestamp %] | -- [% loopro.user %] - | -[% loopro.module %] | -[% loopro.action %] | -- [% IF ( module == 'MEMBERS' ) %] - member [% loopro.object %] - [% ELSE %] - [% IF ( module == 'CIRCULATION' ) %] - - [% IF ( loopro.object ) %] - member [% loopro.object %] - [% END %] - - [% ELSE %] - [% IF ( module == 'CATALOGUING' ) %] - [% IF ( info == 'item' ) %] - Item [% loopro.object %] - [% ELSE %] - biblio [% loopro.object %] - [% END %] - [% ELSE %] - [% IF ( module == 'SERIAL' ) %] - [% loopro.object %] - [% ELSE %] - [% IF ( module == 'AUTHORITIES' ) %] - auth [% loopro.object %] - [% ELSE %] - [% loopro.object %] - [% END %] - [% END %] - [% END %] - [% END %] - [% END %] - | -- [% IF ( loopro.CIRCULATION ) %] - biblio [% loopro.info |html %] - [% ELSE %] - [% loopro.info |html %] - [% END %] - | -