From f1564d068adba59536402e3ba79e2c7cd907e389 Mon Sep 17 00:00:00 2001
From: danielvincent <danielgrippi@gmail.com>
Date: Tue, 4 Jan 2011 15:14:52 -0800
Subject: [PATCH] pass @all_aspects as opposed to @aspects in stream

---
 app/controllers/status_messages_controller.rb | 2 +-
 app/helpers/sockets_helper.rb                 | 4 ++--
 app/views/shared/_stream.haml                 | 2 +-
 app/views/shared/_stream_element.haml         | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb
index 0c05b1008..6def50c66 100644
--- a/app/controllers/status_messages_controller.rb
+++ b/app/controllers/status_messages_controller.rb
@@ -43,7 +43,7 @@ class StatusMessagesController < ApplicationController
                                          :person => @status_message.person,
                                          :photos => @status_message.photos,
                                          :comments => [],
-                                         :aspects => current_user.aspects,
+                                         :all_aspects => current_user.aspects,
                                          :current_user => current_user
                                         }
                                      )
diff --git a/app/helpers/sockets_helper.rb b/app/helpers/sockets_helper.rb
index f810538f0..e770f5b5a 100644
--- a/app/helpers/sockets_helper.rb
+++ b/app/helpers/sockets_helper.rb
@@ -28,14 +28,14 @@ module SocketsHelper
             }
         },
           :current_user => user,
-          :aspects => user.aspects,
+          :all_aspects => user.aspects,
         }
         v = render_to_string(:partial => 'shared/stream_element', :locals => post_hash)
       elsif object.is_a? Person
         person_hash = {
           :single_aspect_form => opts["single_aspect_form"],
           :person => object,
-          :aspects => user.aspects,
+          :all_aspects => user.aspects,
           :contact => user.contact_for(object),
           :request => user.request_for(object),
           :current_user => user}
diff --git a/app/views/shared/_stream.haml b/app/views/shared/_stream.haml
index b349c3a93..bbe215430 100644
--- a/app/views/shared/_stream.haml
+++ b/app/views/shared/_stream.haml
@@ -2,4 +2,4 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 - for post_hash in posts
-  = render 'shared/stream_element', post_hash.merge(:aspects => @aspects, :commenting_disabled => defined?(@commenting_disabled))
+  = render 'shared/stream_element', post_hash.merge(:all_aspects => @all_aspects, :commenting_disabled => defined?(@commenting_disabled))
diff --git a/app/views/shared/_stream_element.haml b/app/views/shared/_stream_element.haml
index ed51bd1e9..1cdd91743 100644
--- a/app/views/shared/_stream_element.haml
+++ b/app/views/shared/_stream_element.haml
@@ -5,7 +5,7 @@
 .stream_element{:data=>{:guid=>post.id}}
   - if person.owner_id == current_user.id
     .right.controls
-      - reshare_aspects = aspects_without_post(aspects, post)
+      - reshare_aspects = aspects_without_post(all_aspects, post)
       - unless reshare_aspects.empty?
         = render 'shared/reshare', :aspects => reshare_aspects, :post => post
       = link_to t('delete'), status_message_path(post), :confirm => t('are_you_sure'), :method => :delete, :remote => true, :class => "delete"
@@ -24,7 +24,7 @@
 
       - elsif person.owner_id == current_user.id
         %span.arrow ➔
-        = aspect_badge(aspects_with_post(aspects, post))
+        = aspect_badge(aspects_with_post(all_aspects, post))
 
 
     = render 'status_messages/status_message', :post => post, :photos => photos