From fb5b377ffd13d9931e9e159b23ce6f886b06d57f Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
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.

Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 .../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 190bd4fb37..0000000000
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-[% IF ( borrowernumber ) %]
-<div id="menu">
-  <ul>
-    [% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber | html %]">Check out</a></li>
-    [% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | html %]">Details</a></li>
-    [% IF ( CAN_user_updatecharges ) %]
-        [% IF ( finesview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber | html %]">Fines</a></li>
-    [% END %]
-    [% IF ( intranetreadinghistory ) %]
-        [% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% borrowernumber | html %]">Circulation history</a></li>
-    [% END %]
-    [% IF ( CAN_user_tools_view_system_logs ) %]
-        [% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=MEMBERS&amp;action=MODIFY&amp;object=[% borrowernumber | html %]">Modification log</a></li>
-    [% END %]
-	[% IF ( sentnotices ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% borrowernumber | html %]">Notices</a></li>
-    [% IF (  statisticsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/statistics.pl?borrowernumber=[% borrowernumber | html %]">Statistics</a></li>
-    [% IF EnableBorrowerFiles %]
-        [% IF ( borrower_files ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/files.pl?borrowernumber=[% borrowernumber | html %]">Files</a></li>
-    [% END %]
-    [% IF CAN_user_borrowers_edit_borrowers && useDischarge %]
-        [% IF dischargeview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% borrowernumber | html %]">Discharge</a></li>
-    [% END %]
-    [% IF Koha.Preference('HouseboundModule') %]
-        [% IF houseboundview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% borrowernumber | html %]">Housebound</a></li>
-    [% END %]
-  </ul>
-</div>
-[% 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 5f6b364727..a5a5c009be 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
@@ -223,9 +223,6 @@
       </form>
     </div>
   </div>
-  <div class="yui-g">
-    [% INCLUDE 'members-menu.inc' %]
-  </div>
 </div>
 
 [% 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 e5b34e139e..fef3fb64ba 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -1168,7 +1168,7 @@
 </div>
 
 [% UNLESS ( opadd ) %]<div class="yui-b">
-[% INCLUDE 'members-menu.inc' %]
+[% INCLUDE 'circ-menu.inc' %]
 </div>[% END %]
 [% END %]
 </div>
-- 
2.39.5