pass @all_aspects as opposed to @aspects in stream
This commit is contained in:
parent
a9195d7730
commit
f1564d068a
4 changed files with 6 additions and 6 deletions
|
|
@ -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
|
||||
}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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))
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue