From f58dec1ac0ad5a7be308ce0e59c3d9ae1e9b00dd Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 10 Jul 2013 16:27:02 -0400
Subject: [PATCH] Also include `deleted_at`
---
app/assets/javascripts/discourse/templates/post.js.handlebars | 2 +-
app/serializers/post_serializer.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/assets/javascripts/discourse/templates/post.js.handlebars b/app/assets/javascripts/discourse/templates/post.js.handlebars
index 405002912..ae609f524 100644
--- a/app/assets/javascripts/discourse/templates/post.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/post.js.handlebars
@@ -58,7 +58,7 @@
{{#if deleted_by}}
<div class='post-actions'>
- {{i18n post.deleted_by}} {{avatar deleted_by imageSize="tiny"}}
+ {{i18n post.deleted_by}} {{avatar deleted_by imageSize="tiny"}} {{unboundAge deleted_at}}
</div>
{{/if}}
diff --git a/app/serializers/post_serializer.rb b/app/serializers/post_serializer.rb
index 05a6277cc..f768a252d 100644
--- a/app/serializers/post_serializer.rb
+++ b/app/serializers/post_serializer.rb
@@ -123,7 +123,7 @@ class PostSerializer < BasicPostSerializer
end
def include_deleted_by?
- object.deleted_by.present?
+ staff? && object.deleted_by.present?
end
# Summary of the actions taken on this post