From 9e46c1c89af1176c3996e69e0a2a841803e0206c Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 14 Feb 2020 11:44:44 +0100 Subject: [PATCH] Bug 19791: Keep user in circ when viewing patron's logs When a librarian is viewing the log for a given patron (tab "modification log" from the circulation module), the "object" and "modules" parameter can be modified. It does not make sense, we should stay in the circulation module and avoid those fields to be modified. Test plan: - Modify several patrons (in order to have several modification logs) - Go to the modification log tab of one of them - Notice that the "Object" input is not a "Borrowernumber" labelled input and that you cannot modify it. Also notice that the "modules" is hidden. - Go to the log viewer tool and notice that the view is still the same as before this patch. Signed-off-by: Owen Leonard Signed-off-by: Martin Renvoize Signed-off-by: Joy Nelson (cherry picked from commit d78feb1d2fed87f2f38b4d4b57a3c0e5cff63b9d) Signed-off-by: Lucas Gass --- .../prog/en/modules/tools/viewlog.tt | 47 +++++++++++-------- 1 file changed, 28 insertions(+), 19 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 3d46a56d1c..6e2632c6e3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt @@ -98,23 +98,27 @@ -
  • - - + [% UNLESS modules %] + [% ELSE %] - + [% END %] - [% END %] - -
  • + [% FOREACH modx IN [ 'CATALOGUING' 'AUTHORITIES' 'MEMBERS' 'ACQUISITIONS' 'SERIAL' 'HOLDS' 'ILL' 'CIRCULATION' 'LETTER' 'FINES' 'SYSTEMPREFERENCE' 'CRONJOBS', 'REPORTS' ] %] + [% IF modules.grep(modx).size %] + + [% ELSE %] + + [% END %] + [% END %] + + + [% ELSE %] + + [% END %]
  • -
  • - - -
  • +
  • + [% IF src == 'circ' %] + + + [% ELSE %] + + + [% END %] +
  • -- 2.39.5