@@ -, +, @@
- Fixes indentation
- changes messages to patron_messages (even though it's not like that on the circulation page.)
---
circ/del_message.pl | 2 +-
.../prog/en/modules/members/moremember.tt | 18 +++++++++---------
members/moremember.pl | 10 +++++-----
3 files changed, 15 insertions(+), 15 deletions(-)
--- a/circ/del_message.pl
+++ a/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 {
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ a/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 %]
--- a/members/moremember.pl
+++ a/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;
--