From 6a98ce37ae15d16b72cf353b1b342b7795d8af95 Mon Sep 17 00:00:00 2001
From: Jason Etheridge <jason@EquinoxInitiative.org>
Date: Wed, 8 Jan 2020 09:04:37 -0500
Subject: [PATCH] lp1846354 OPAC changes

Surface the edit date for patron visible notes in the Message Center.

Signed-off-by: Jason Etheridge <jason@EquinoxInitiative.org>
---
 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm   | 3 ++-
 Open-ILS/src/templates/opac/myopac/messages/list.tt2           | 4 ++++
 Open-ILS/src/templates/opac/myopac/messages/single_message.tt2 | 7 +++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
index 5bc2f8b98c..c63aadca80 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
@@ -318,6 +318,7 @@ sub load_myopac_messages {
             title       => $aum->title,
             message     => $aum->message,
             create_date => $aum->create_date,
+            edit_date   => $aum->edit_date,
             is_read     => defined($aum->read_date) ? 1 : 0,
             library     => $aum->sending_lib->name,
         };
@@ -2144,7 +2145,7 @@ sub load_myopac_main {
     my $offset = $self->cgi->param('offset') || 0;
     $self->ctx->{search_ou} = $self->_get_search_lib();
     $self->ctx->{user}->notes(
-        $self->editor->search_actor_usr_note({
+        $self->editor->search_actor_usr_message({
             usr => $self->ctx->{user}->id,
             pub => 't'
         })
diff --git a/Open-ILS/src/templates/opac/myopac/messages/list.tt2 b/Open-ILS/src/templates/opac/myopac/messages/list.tt2
index 7702c1e150..ed9d9d05a3 100644
--- a/Open-ILS/src/templates/opac/myopac/messages/list.tt2
+++ b/Open-ILS/src/templates/opac/myopac/messages/list.tt2
@@ -100,7 +100,11 @@
                         <input type="checkbox" name="message_id" value="[% message.id %]"
                             [% html_text_attr('title', l('Select message [_1]', message.title)) %]/>
                         </td>
+                        [% IF message.edit_date %]
+                        <td>[% date.format(ctx.parse_datetime(message.edit_date), DATE_FORMAT); %]</td>
+                        [% ELSE %]
                         <td>[% date.format(ctx.parse_datetime(message.create_date), DATE_FORMAT); %]</td>
+                        [% END %]
                         <td>[% message.library | html %]</td>
                         <td><a href="[% mkurl('messages', { single => 1, message_id => message.id } ) %]">[% message.title | html %]</a></td>
                     </tr>
diff --git a/Open-ILS/src/templates/opac/myopac/messages/single_message.tt2 b/Open-ILS/src/templates/opac/myopac/messages/single_message.tt2
index 2e49ddb661..ff8303996a 100644
--- a/Open-ILS/src/templates/opac/myopac/messages/single_message.tt2
+++ b/Open-ILS/src/templates/opac/myopac/messages/single_message.tt2
@@ -30,6 +30,13 @@
                     class='color_4 light_border'>[% l("Date") %]</td>
                 <td class='myopac_message_date'>[% date.format(ctx.parse_datetime(ctx.patron_messages.0.create_date), DATE_FORMAT); %]</td>
             </tr>
+            [% IF ctx.patron_messages.0.edit_date %]
+            <tr>
+                <td width='30%'
+                    class='color_4 light_border'>[% l("Edit Date") %]</td>
+                <td class='myopac_message_date'>[% date.format(ctx.parse_datetime(ctx.patron_messages.0.edit_date), DATE_FORMAT); %]</td>
+            </tr>
+            [% END %]
             <tr>
                 <td width='30%'
                     class='color_4 light_border'>[% l("Library") %]</td>
-- 
2.11.0