diff --git a/app/helpers/sockets_helper.rb b/app/helpers/sockets_helper.rb index 629709402..194f321ff 100644 --- a/app/helpers/sockets_helper.rb +++ b/app/helpers/sockets_helper.rb @@ -13,8 +13,7 @@ module SocketsHelper begin v = render_to_string(:partial => type_partial(object), :locals => {:post => object}) unless object.is_a? Retraction rescue Exception => e - Rails.logger.error("web socket view rendering failed for some reason." + v.inspect) - Rails.logger.error("Socketed object was #{object.inspect}") + Rails.logger.error("web socket view rendering failed for object #{object.inspect}.") raise e end action_hash = {:class =>object.class.to_s.underscore.pluralize, :html => v, :post_id => obj_id(object)} diff --git a/app/models/person.rb b/app/models/person.rb index 7036a85f1..196a249fa 100644 --- a/app/models/person.rb +++ b/app/models/person.rb @@ -107,6 +107,7 @@ class Person end def owns?(post) + puts self.class self.id == post.person.id end diff --git a/app/views/albums/_album.html.haml b/app/views/albums/_album.html.haml index d4a629ba0..52cb7fe4a 100644 --- a/app/views/albums/_album.html.haml +++ b/app/views/albums/_album.html.haml @@ -1,4 +1,4 @@ -.album{:id => post.id, :class => ("mine" if mine?(post))} +.album{:id => post.id, :class => ("mine" if current_user.owns?(post))} %div.name = link_to post.name, object_path(post) diff --git a/app/views/albums/show.html.haml b/app/views/albums/show.html.haml index 253d94d19..92b3c2756 100644 --- a/app/views/albums/show.html.haml +++ b/app/views/albums/show.html.haml @@ -4,7 +4,7 @@ = @album.name - -if mine? @album + -if current_user.owns? @album .button.right#add_photos_button = link_to 'Add Photos', '#' @@ -14,7 +14,7 @@ .sub_header ="updated #{how_long_ago(@album)}" --unless mine? @album +-unless current_user.owns? @album %h4= "by #{@album.person.real_name}" #thumbnails @@ -25,6 +25,6 @@ #content_bottom .back = link_to "⇧ albums", albums_path - -if mine? @album + -if current_user.owns? @album .button.right = link_to 'Edit Album', edit_album_path(@album) diff --git a/app/views/blogs/_blog.html.haml b/app/views/blogs/_blog.html.haml index 79d0612b3..0a4f79feb 100644 --- a/app/views/blogs/_blog.html.haml +++ b/app/views/blogs/_blog.html.haml @@ -1,4 +1,4 @@ -%li.message{:id => post.id, :class => ("mine" if mine?(post))} +%li.message{:id => post.id, :class => ("mine" if current_user.owns?(post))} = person_image_tag(post.person) @@ -15,6 +15,6 @@ = link_to "show comments (#{post.comments.count})", '#', :class => "show_post_comments" = render "comments/comments", :post => post - - if mine?(post) + - if current_user.owns?(post) .destroy_link = link_to 'Delete', blog_path(post), :confirm => 'Are you sure?', :method => :delete, :remote=> true diff --git a/app/views/bookmarks/_bookmark.html.haml b/app/views/bookmarks/_bookmark.html.haml index 8356bf91d..dd0dffce9 100644 --- a/app/views/bookmarks/_bookmark.html.haml +++ b/app/views/bookmarks/_bookmark.html.haml @@ -1,4 +1,4 @@ -%li.message{:id => post.id, :class => ("mine" if mine?(post))} +%li.message{:id => post.id, :class => ("mine" if current_user.owns?(post))} = person_image_tag(post.person) @@ -16,6 +16,6 @@ = link_to "show comments (#{post.comments.count})", '#', :class => "show_post_comments" = render "comments/comments", :post => post - - if mine?(post) + - if current_user.owns?(post) .destroy_link = link_to 'Delete', bookmark_path(post), :confirm => 'Are you sure?', :method => :delete, :remote => true diff --git a/app/views/photos/edit.html.haml b/app/views/photos/edit.html.haml index c849b43b7..baeb82a3d 100644 --- a/app/views/photos/edit.html.haml +++ b/app/views/photos/edit.html.haml @@ -15,7 +15,7 @@ #content_bottom .back = link_to "⇧ #{@album.name}", album_path(@album) - -if mine? @album + -if current_user.owns? @album .button.right = link_to 'Delete Photo', @photo, :confirm => 'Are you sure?', :method => :delete diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml index d08790650..f1956ee4d 100644 --- a/app/views/photos/show.html.haml +++ b/app/views/photos/show.html.haml @@ -25,7 +25,7 @@ #content_bottom .back = link_to "⇧ #{@album.name}", album_path(@album) - -if mine? @album + -if current_user.owns? @album .button.right = link_to 'Delete Photo', @photo, :confirm => 'Are you sure?', :method => :delete diff --git a/app/views/shared/_post_wrapper.haml b/app/views/shared/_post_wrapper.haml index bdba9db70..a65866a08 100644 --- a/app/views/shared/_post_wrapper.haml +++ b/app/views/shared/_post_wrapper.haml @@ -1,4 +1,4 @@ -%li.message{:id => post.id, :class => ("mine" if mine?(post))} +%li.message{:id => post.id, :class => ("mine" if current_user.owns?(post))} = person_image_link(post.person) = yield post_yield_tag(post) - = = render type_partial(post), :post => post \ No newline at end of file + = = render type_partial(post), :post => post diff --git a/app/views/status_messages/_status_message.html.haml b/app/views/status_messages/_status_message.html.haml index 5681e9753..adb774cd6 100644 --- a/app/views/status_messages/_status_message.html.haml +++ b/app/views/status_messages/_status_message.html.haml @@ -1,4 +1,4 @@ -%li.message{:id => post.id, :class => ("mine" if mine?(post))} +%li.message{:id => post.id, :class => ("mine" if current_user.owns?(post))} = person_image_link(post.person) @@ -12,6 +12,6 @@ = link_to "show comments (#{post.comments.count})", '#', :class => "show_post_comments" = render "comments/comments", :post => post - - if mine?(post) + - if current_user.owns?(post) .destroy_link = link_to 'Delete', status_message_path(post), :confirm => 'Are you sure?', :method => :delete, :remote => true