From 8e4c2bb2c7df66c13f11a408bed32da8fc1fc6dd Mon Sep 17 00:00:00 2001 From: Sophie Meynieux Date: Wed, 4 Nov 2015 19:04:26 +0100 Subject: [PATCH] Bug 14157: Notices tab in the patron record should not depend on EnhancedMessagingPreferences to display MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Overdue and Hold notices can be sent even if EnhancedMessagingPreference is set to "Don't Allow", so Notices tab have to be visible in all cases. Test plan : - without patch : - set EnhancedMessagingPreference to "Don't Allow" and go to patron record : there is no Notices tab - set EnhancedMessagingPreference to "Allow" and og to patron record: there is a Notices tab - apply this patch : - go to patron record, you cas see a Notices tab - change the value of EnhanceMessagingPreferences, Notices tab is always visible. Followed test plan, works as expected Signed-off-by: Marc Véron Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 471b1a8b69ff3842fbddda1e0aa068d439c85a0d) Signed-off-by: Frédéric Demians Conflicts: koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc 3.20 had some other new (unrelated) things, resolved conflict and retested, all ok. --- koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc | 2 -- koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc | 2 -- 2 files changed, 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc index 2fe0a6857c..e4eeb9baa4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc @@ -76,9 +76,7 @@ [% IF ( CAN_user_parameters ) %] [% IF ( logview ) %]
  • [% ELSE %]
  • [% END %]Modification log
  • [% END %] - [% IF ( EnhancedMessagingPreferences ) %] [% IF ( sentnotices ) %]
  • [% ELSE %]
  • [% END %]Notices
  • - [% END %] [% IF ( statisticsview ) %]
  • [% ELSE %]
  • [% END %]Statistics
  • [% IF EnableBorrowerFiles %] [% IF ( borrower_files ) %]
  • [% ELSE %]
  • [% END %]Files
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc index 9bd528516b..6f6524bc84 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc @@ -12,9 +12,7 @@ [% IF ( CAN_user_parameters ) %] [% IF ( logview ) %]
  • [% ELSE %]
  • [% END %]Modification log
  • [% END %] - [% IF ( EnhancedMessagingPreferences ) %] [% IF ( sentnotices ) %]
  • [% ELSE %]
  • [% END %]Notices
  • - [% END %] [% IF ( statisticsview ) %]
  • [% ELSE %]
  • [% END %]Statistics
  • [% IF EnableBorrowerFiles %] [% IF ( borrower_files ) %]
  • [% ELSE %]
  • [% END %]Files
  • -- 2.39.5