From 0eca3263f5125d9c52450a6853f4d492f3e0ad29 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 29 Jun 2018 14:26:17 +0000 Subject: [PATCH] Bug 20223: Merge members-menu and circ-menu inc files This patch removes members-menu.inc and replaces the last functional use of it with a call to circ-menu.inc. An invalid use of members-menu.inc has been removed from member.tt. To test, apply the patch and open a patron record for editing. The sidebar menu should look correct and all sidebar links should work correctly. View the patrons home page and confirm that nothing has broken. Search the Koha codebase for references to members-menu.inc. There should be none. --- .../prog/en/includes/members-menu.inc | 28 ---------------------- .../prog/en/modules/members/member.tt | 3 --- .../prog/en/modules/members/memberentrygen.tt | 2 +- 3 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc deleted file mode 100644 index 43d0e5a..0000000 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc +++ /dev/null @@ -1,28 +0,0 @@ -[% IF ( borrowernumber ) %] - -[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt index fb62cb9..41d55bc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt @@ -227,9 +227,6 @@ -
- [% INCLUDE 'members-menu.inc' %] -
[% MACRO jsinclude BLOCK %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index e3db7c9..e25d8d9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -1150,7 +1150,7 @@ [% UNLESS ( opadd ) %]
-[% INCLUDE 'members-menu.inc' %] +[% INCLUDE 'circ-menu.inc' %]
[% END %] [% END %] -- 2.1.4