View | Details | Raw Unified | Return to bug 17397
Collapse All | Expand All

(-)a/circ/circulation.pl (-18 / +2 lines)
Lines 564-570 if ( $borrowernumber && $borrower->{'category_type'} eq 'C') { Link Here
564
    $template->param( 'catcode' => $patron_categories->next )  if $patron_categories->count == 1;
564
    $template->param( 'catcode' => $patron_categories->next )  if $patron_categories->count == 1;
565
}
565
}
566
566
567
my $all_messages = Koha::Patron::Messages->search(
567
my $messages = Koha::Patron::Messages->search(
568
    {
568
    {
569
        'me.borrowernumber' => $borrowernumber,
569
        'me.borrowernumber' => $borrowernumber,
570
    },
570
    },
Lines 575-596 my $all_messages = Koha::Patron::Messages->search( Link Here
575
    }
575
    }
576
);
576
);
577
577
578
my @messages;
579
while ( my $content = $all_messages->next ) {
580
    my $this_item;
581
582
    $this_item->{borrowernumber} = $content->borrowernumber;
583
    $this_item->{message_id}     = $content->message_id;
584
    $this_item->{branchcode}     = $content->branchcode;
585
    $this_item->{message_type}   = $content->message_type;
586
    $this_item->{message_date}   = $content->message_date;
587
    $this_item->{message}        = $content->message;
588
    $this_item->{manager_id}     = $content->manager_id;
589
    $this_item->{name}           = $content->_result->get_column('manager_firstname') . ' ' . $content->_result->get_column('manager_surname');
590
591
    push @messages, $this_item;
592
}
593
594
my $fast_cataloging = 0;
578
my $fast_cataloging = 0;
595
if (defined getframeworkinfo('FA')) {
579
if (defined getframeworkinfo('FA')) {
596
    $fast_cataloging = 1 
580
    $fast_cataloging = 1 
Lines 639-645 if ($restoreduedatespec || $stickyduedate) { Link Here
639
}
623
}
640
624
641
$template->param(
625
$template->param(
642
    messages           => \@messages,
626
    messages           => $messages,
643
    borrower          => $borrower,
627
    borrower          => $borrower,
644
    borrowernumber    => $borrowernumber,
628
    borrowernumber    => $borrowernumber,
645
    categoryname      => $borrower->{'description'},
629
    categoryname      => $borrower->{'description'},
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-2 / +1 lines)
Lines 859-865 No patron matched <span class="ex">[% message | html %]</span> Link Here
859
                    [% END %]>
859
                    [% END %]>
860
                        [% message.message_date | $KohaDates %]
860
                        [% message.message_date | $KohaDates %]
861
                        [% Branches.GetName( message.branchcode ) %]
861
                        [% Branches.GetName( message.branchcode ) %]
862
                        ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.manager_id %]">[% message.name %]</a> )
862
                        ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.manager_id %]">[% message.get_column('manager_firstname') %] [% message.get_column('manager_surname') %]</a> )
863
                        <i>"[% message.message %]"</i>
863
                        <i>"[% message.message %]"</i>
864
                    </span>
864
                    </span>
865
                    [% IF message.branchcode == branch OR Koha.Preference('AllowAllMessageDeletion') %]
865
                    [% IF message.branchcode == branch OR Koha.Preference('AllowAllMessageDeletion') %]
866
- 

Return to bug 17397