From eaea26e58d7781c79d7ea962b491cfd4aeb06445 Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Thu, 23 Sep 2010 19:33:33 -0700
Subject: [PATCH] the public aspect is now set in application controller
---
app/controllers/application_controller.rb | 4 +++-
app/controllers/aspects_controller.rb | 1 -
app/views/shared/_aspect_friends.haml | 2 +-
app/views/shared/_publisher.haml | 5 +++--
app/views/shared/_sub_header.haml | 2 ++
5 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 2fecb4f907..1cbdc7c39e 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -23,7 +23,9 @@ class ApplicationController < ActionController::Base
def set_friends_and_status
if current_user
- if params[:aspect] == nil || params[:aspect] == 'all'
+ if params[:action] == 'public'
+ @aspect = :public
+ elsif params[:aspect] == nil || params[:aspect] == 'all'
@aspect = :all
else
@aspect = current_user.aspect_by_id( params[:aspect])
diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb
index 9112792c1c..f05edfe6e0 100644
--- a/app/controllers/aspects_controller.rb
+++ b/app/controllers/aspects_controller.rb
@@ -50,7 +50,6 @@ class AspectsController < ApplicationController
:scope=>MiniFB.scopes.join(","))
@posts = current_user.visible_posts(:by_members_of => :all).paginate :page => params[:page], :per_page => 15, :order => 'created_at DESC'
- @aspect = :all
respond_with @aspect
end
diff --git a/app/views/shared/_aspect_friends.haml b/app/views/shared/_aspect_friends.haml
index 6ab286a819..f4aa811b19 100644
--- a/app/views/shared/_aspect_friends.haml
+++ b/app/views/shared/_aspect_friends.haml
@@ -8,7 +8,7 @@
- for friend in @friends
= person_image_link(friend)
- -unless @aspect == :all
+ -unless (@aspect == :all) || (@aspect == :public)
= link_to (image_tag('add_friend_button.png', :height => "50px", :width => "50px")), "#add_request_pane", :id => 'add_request_button'
.yo{:style => 'display:none'}
diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml
index 4714b1f1f3..54f14c27ac 100644
--- a/app/views/shared/_publisher.haml
+++ b/app/views/shared/_publisher.haml
@@ -5,20 +5,21 @@
#publisher
= owner_image_tag
+ = @aspect
= form_for StatusMessage.new, :remote => true do |f|
= f.error_messages
%p
%label{:for => "status_message_message"} Message
= f.text_area :message, :rows => 2, :value => params[:prefill]
- = "going to Facebook as #{MiniFB.get(@access_token, 'me')[:name]}" if @logged_in && (params[:action] == 'public')
+ = "going to Facebook as #{MiniFB.get(@access_token, 'me')[:name]}" if @logged_in && @aspect == :public
= f.hidden_field( :public, :value => (params[:action] == 'public') )
%ul.aspect_selector{ :style => "display:none;"}
going to...
- for aspect in @aspects
%li
- = check_box_tag("aspect_ids[]", aspect.id, (params[:action] == 'public') || @aspect == :all || current_aspect?(aspect) )
+ = check_box_tag("aspect_ids[]", aspect.id, @aspect == :public || @aspect == :all || current_aspect?(aspect) )
= aspect.name
= f.submit "Share"
diff --git a/app/views/shared/_sub_header.haml b/app/views/shared/_sub_header.haml
index 4e0e2aca4a..c8b2bd5e98 100644
--- a/app/views/shared/_sub_header.haml
+++ b/app/views/shared/_sub_header.haml
@@ -10,6 +10,8 @@
= link_to "All Aspects", root_path
- elsif @aspect == :manage
= "Manage Aspects"
+ - elsif @aspect == :public
+ = "Public"
- else
= link_to @aspect.name, @aspect
--
GitLab