Merge remote-tracking branch 'upstream/pull/5064'

[rails.git] / app / views / api / messages / _message.json.jbuilder

diff --git a/app/views/api/messages/_message.json.jbuilder b/app/views/api/messages/_message.json.jbuilder
index a04295d31304fa98f204c84d33a23a465284e1a1..840ad19d029d230c69802c1d04e188218b961d85 100644 (file)
--- a/app/views/api/messages/_message.json.jbuilder
+++ b/app/views/api/messages/_message.json.jbuilder
@@ -6,10 +6,11 @@ json.to_display_name message.recipient.display_name
 json.title message.title
 json.sent_on message.sent_on.xmlschema
 
 json.title message.title
 json.sent_on message.sent_on.xmlschema
 

+json.message_read message.message_read if current_user.id == message.to_user_id
+

 if current_user.id == message.from_user_id
   json.deleted !message.from_user_visible
 elsif current_user.id == message.to_user_id
 if current_user.id == message.from_user_id
   json.deleted !message.from_user_visible
 elsif current_user.id == message.to_user_id

-  json.message_read message.message_read

   json.deleted !message.to_user_visible
 end
 
   json.deleted !message.to_user_visible
 end