diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 09f82d38e3c2e15fb35b1bf0d80d13a768fd12e2..82a8f7cd1d552aa9c4d55099f42f040919970fb0 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -22,9 +22,7 @@ class ApplicationController < ActionController::Base def set_friends_and_status if current_user - if params[:action] == 'public' - @aspect = :public - elsif params[:aspect] == nil || params[:aspect] == 'all' + if params[:aspect] == nil || params[:aspect] == 'all' @aspect = :all else @aspect = current_user.aspect_by_id( params[:aspect]) diff --git a/app/views/aspects/public.html.haml b/app/views/aspects/public.html.haml index 381676cf29557f92cf5f4be19c1f5ebc0740b44f..95c185761bb98595939976934b65e45f329b29b6 100644 --- a/app/views/aspects/public.html.haml +++ b/app/views/aspects/public.html.haml @@ -10,9 +10,7 @@ = render "shared/aspect_friends" - content_for :publish do - - if @logged_in - = render "shared/publisher", :aspect_ids => :public - - else + - if = render "shared/publisher", :aspect_ids => :all %ul#stream diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml index dc9265abb945b7b67f3e215713882d3351bc96a1..a3c3663683771060e12801a2f3660aee6125bb75 100644 --- a/app/views/shared/_publisher.haml +++ b/app/views/shared/_publisher.haml @@ -15,11 +15,11 @@ going to... - for aspect in @aspects %li - = check_box_tag("aspect_ids[]", aspect.id, @aspect == :public || @aspect == :all || current_aspect?(aspect) ) + = check_box_tag("aspect_ids[]", aspect.id, @aspect == :all || current_aspect?(aspect) ) = aspect.name = connected_fb_as(@access_token) if @logged_in && @aspect == :all - = f.hidden_field( :public, :value => (params[:action] == 'public') ) + = f.hidden_field( :public, :value => false ) .buttons = f.submit t('.share')