Do not try to render posts/comments which are not present
refs diaspora/diaspora#4959
This commit is contained in:
parent
01381ddf25
commit
6d6ebd297e
4 changed files with 13 additions and 8 deletions
|
|
@ -5,6 +5,9 @@
|
|||
span {
|
||||
display: block;
|
||||
}
|
||||
span.text {
|
||||
padding-bottom: 1em;
|
||||
}
|
||||
}
|
||||
.options {
|
||||
float: right;
|
||||
|
|
|
|||
|
|
@ -4,13 +4,14 @@
|
|||
|
||||
module ReportHelper
|
||||
def report_content(id, type)
|
||||
raw case type
|
||||
when 'post'
|
||||
t('report.post_label', title: link_to(post_page_title(Post.find_by_id(id)), post_path(id)))
|
||||
when 'comment'
|
||||
# comment_message is not html_safe. To prevent
|
||||
# cross-site-scripting we have to escape html
|
||||
t('report.comment_label', data: h(comment_message(Comment.find_by_id(id))))
|
||||
if type == 'post' && !(post = Post.find_by_id(id)).nil?
|
||||
raw t('report.post_label', title: link_to(post_page_title(post), post_path(id)))
|
||||
elsif type == 'comment' && !(comment = Comment.find_by_id(id)).nil?
|
||||
# comment_message is not html_safe. To prevent
|
||||
# cross-site-scripting we have to escape html
|
||||
raw t('report.comment_label', data: h(comment_message(comment)))
|
||||
else
|
||||
raw t('report.not_found')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
- @reports.each do |r|
|
||||
- username = User.find_by_id(r.user_id).username
|
||||
%div.content
|
||||
%span
|
||||
%span.text
|
||||
= report_content(r.item_id, r.item_type)
|
||||
%span
|
||||
= raw t('report.reported_label', person: link_to(username, user_profile_path(username)))
|
||||
|
|
|
|||
|
|
@ -894,6 +894,7 @@ en:
|
|||
review_link: "Mark as reviewed"
|
||||
delete_link: "Delete item"
|
||||
confirm_deletion: "Are you sure to delete the item?"
|
||||
not_found: "<u>The post/comment was not found. It seams that it was deleted by the user!</u>"
|
||||
status:
|
||||
marked: "The report was marked as reviewed"
|
||||
destroyed: "The post was destroyed"
|
||||
|
|
|
|||
Loading…
Reference in a new issue