From 6d175a9bea7ca0d97ac932be705423188952a8b2 Mon Sep 17 00:00:00 2001 From: Liz Rea 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 Signed-off-by: Alex Arnaud --- 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) {

Messages:

    - [% FOREACH message IN messages %] + [% FOREACH patron_message IN patron_messages %]
  • - [% IF(message.message_type == "L") %] + [% IF(patron_message.message_type == "L") %] [% ELSE %] [% END %] - [% message.message_date | $KohaDates %] - [% Branches.GetName( message.branchcode ) %] - [% IF message.manager_id %] - ( [% message.get_column('manager_firstname') %] [% message.get_column('manager_surname') %] ) + [% patron_message.message_date | $KohaDates %] + [% Branches.GetName( patron_message.branchcode ) %] + [% IF patron_message.manager_id %] + ( [% patron_message.get_column('manager_firstname') %] [% patron_message.get_column('manager_surname') %] ) [% END %] - "[% message.message | html %]" + "[% patron_message.message | html %]" - [% IF message.branchcode == branchcode OR Koha.Preference('AllowAllMessageDeletion') %] - Delete + [% IF patron_message.branchcode == branchcode OR Koha.Preference('AllowAllMessageDeletion') %] + Delete [% END %]
  • [% END %] diff --git a/members/moremember.pl b/members/moremember.pl index 82623d4..1bf4d22 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -332,14 +332,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'], } ); @@ -372,7 +372,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