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

pass @all_aspects as opposed to @aspects in stream

Browse source
This commit is contained in:
danielvincent 2011-01-04 15:14:52 -08:00
parent a9195d7730
commit f1564d068a
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/status_messages_controller.rb
View file

@ -43,7 +43,7 @@ class StatusMessagesController < ApplicationController
:person => @status_message.person, :person => @status_message.person,
:photos => @status_message.photos, :photos => @status_message.photos,
:comments => [], :comments => [],
:aspects => current_user.aspects, :all_aspects => current_user.aspects,
:current_user => current_user :current_user => current_user
} }
) )

4
app/helpers/sockets_helper.rb
View file

@ -28,14 +28,14 @@ module SocketsHelper
} }
}, },
:current_user => user, :current_user => user,
:aspects => user.aspects, :all_aspects => user.aspects,
} }
v = render_to_string(:partial => 'shared/stream_element', :locals => post_hash) v = render_to_string(:partial => 'shared/stream_element', :locals => post_hash)
elsif object.is_a? Person elsif object.is_a? Person
person_hash = { person_hash = {
:single_aspect_form => opts["single_aspect_form"], :single_aspect_form => opts["single_aspect_form"],
:person => object, :person => object,
:aspects => user.aspects, :all_aspects => user.aspects,
:contact => user.contact_for(object), :contact => user.contact_for(object),
:request => user.request_for(object), :request => user.request_for(object),
:current_user => user} :current_user => user}

2
app/views/shared/_stream.haml
View file

@ -2,4 +2,4 @@
-# licensed under the Affero General Public License version 3 or later. See -# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
- for post_hash in posts - 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))

4
app/views/shared/_stream_element.haml
View file

@ -5,7 +5,7 @@
.stream_element{:data=>{:guid=>post.id}} .stream_element{:data=>{:guid=>post.id}}
- if person.owner_id == current_user.id - if person.owner_id == current_user.id
.right.controls .right.controls
- reshare_aspects = aspects_without_post(aspects, post) - reshare_aspects = aspects_without_post(all_aspects, post)
- unless reshare_aspects.empty? - unless reshare_aspects.empty?
= render 'shared/reshare', :aspects => reshare_aspects, :post => post = 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" = 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 - elsif person.owner_id == current_user.id
%span.arrow ➔ %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 = render 'status_messages/status_message', :post => post, :photos => photos