From 9a31688bdefcfb8f9343c6f5f7ac4dc2463e66b2 Mon Sep 17 00:00:00 2001
From: Liz Rea <liz@catalyst.net.nz>
Date: Wed, 3 Jan 2018 10:43:25 +1300
Subject: [PATCH] Bug 19801 - Fixes for QA

- Fixes indentation
- changes messages to patron_messages (even though it's not like that on the circulation page.)

Signed-off-by: Marjorie Vila <marjorie.barry-vila@collecto.ca>
---
 circ/del_message.pl                                    |  2 +-
 .../prog/en/modules/members/moremember.tt              | 18 +++++++++---------
 members/moremember.pl                                  | 10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/circ/del_message.pl b/circ/del_message.pl
index d7cf91c..8dfa3d4 100755
--- a/circ/del_message.pl
+++ b/circ/del_message.pl
@@ -43,7 +43,7 @@ my $message_id     = $input->param('message_id');
 my $message = Koha::Patron::Messages->find($message_id);
 $message->delete if $message;
 
-if ( $input->param('from') == "moremember" ) {
+if ( $input->param('from') eq  "moremember" ) {
     print $input->redirect(
         "/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");
 } else {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
index 67c168a..a0fe938 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -194,22 +194,22 @@ function validate1(date) {
     <div id="messages" class="circmessage">
         <h4>Messages:</h4>
         <ul>
-            [% FOREACH message IN messages %]
+            [% FOREACH patron_message IN patron_messages %]
                 <li>
-                    [% IF(message.message_type == "L") %]
+                    [% IF(patron_message.message_type == "L") %]
                         <span class="circ-hlt">
                     [% ELSE %]
                         <span>
                     [% END %]
-                        [% message.message_date | $KohaDates %]
-                        [% Branches.GetName( message.branchcode ) %]
-                        [% IF message.manager_id %]
-                            ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.manager_id %]">[% message.get_column('manager_firstname') %] [% message.get_column('manager_surname') %]</a> )
+                        [% patron_message.message_date | $KohaDates %]
+                        [% Branches.GetName( patron_message.branchcode ) %]
+                        [% IF patron_message.manager_id %]
+                            ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron_message.manager_id %]">[% patron_message.get_column('manager_firstname') %] [% patron_message.get_column('manager_surname') %]</a> )
                         [% END %]
-                        <i>"[% message.message | html %]"</i>
+                        <i>"[% patron_message.message | html %]"</i>
                     </span>
-                    [% IF message.branchcode == branchcode OR Koha.Preference('AllowAllMessageDeletion') %]
-                        <a class="btn btn-link btn-sm" href="/cgi-bin/koha/circ/del_message.pl?message_id=[% message.message_id %]&amp;borrowernumber=[% message.borrowernumber %]&amp;from=moremember" onclick="return confirm(MSG_CONFIRM_DELETE_MESSAGE);"><i class="fa fa-trash"></i> Delete</a>
+                    [% IF patron_message.branchcode == branchcode OR Koha.Preference('AllowAllMessageDeletion') %]
+                        <a class="btn btn-link btn-sm" href="/cgi-bin/koha/circ/del_message.pl?message_id=[% patron_message.message_id %]&amp;borrowernumber=[% patron_message.borrowernumber %]&amp;from=moremember" onclick="return confirm(MSG_CONFIRM_DELETE_MESSAGE);"><i class="fa fa-trash"></i> Delete</a>
                     [% END %]
                 </li>
             [% END %]
diff --git a/members/moremember.pl b/members/moremember.pl
index f10e905..6cfb357 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -333,14 +333,14 @@ if ( C4::Context->preference("ExportCircHistory") ) {
     $template->param(csv_profiles => [ Koha::CsvProfiles->search({ type => 'marc' }) ]);
 }
 
-my $messages = Koha::Patron::Messages->search(
+my $patron_messages = Koha::Patron::Messages->search(
     {
         'me.borrowernumber' => $borrowernumber,
     },
     {
-       join => 'manager',
-       '+select' => ['manager.surname', 'manager.firstname' ],
-       '+as' => ['manager_surname', 'manager_firstname'],
+        join => 'manager',
+        '+select' => ['manager.surname', 'manager.firstname' ],
+        '+as' => ['manager_surname', 'manager_firstname'],
     }
 );
 
@@ -373,7 +373,7 @@ $template->param(
     PatronsPerPage => C4::Context->preference("PatronsPerPage") || 20,
     relatives_issues_count => $relatives_issues_count,
     relatives_borrowernumbers => \@relatives,
-    messages       => $messages,
+    patron_messages       => $patron_messages,
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;
-- 
2.7.4