nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

a bad fix for a 500 on notification show when the post is deleted

Browse source
This commit is contained in:
maxwell 2010-12-21 12:54:19 -08:00
parent 0da4466da2
commit c2c6c00db8
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/helpers/notifications_helper.rb
View file

@ -8,7 +8,12 @@ module NotificationsHelper
when 'new_request' when 'new_request'
translation translation
when 'comment_on_post' when 'comment_on_post'
"#{translation} #{link_to t('notifications.post'), object_path(Comment.first(:id => note.target_id).post)}".html_safe comment = Comment.first(:id => note.target_id)
if comment
"#{translation} #{link_to t('notifications.post'), object_path(comment.post)}".html_safe
else
"#{translation} #{t('notifications.deleted')} #{t('notifications.post')}"
end
else else
end end
end end

1
config/locales/diaspora/en.yml
View file

@ -188,6 +188,7 @@ en:
new_request: "offered to share with you." new_request: "offered to share with you."
comment_on_post: "commented on your" comment_on_post: "commented on your"
post: 'post' post: 'post'
deleted: 'deleted'
index: index:
notifications: "Notifications" notifications: "Notifications"
users: users: