From e4d6e170e38e80934276fa1c35b9df7d545837e0 Mon Sep 17 00:00:00 2001
From: danielvincent <danielgrippi@gmail.com>
Date: Wed, 20 Oct 2010 10:22:29 -0700
Subject: [PATCH] aspect tab no longer selected on user#edit and person#show,
 person#index

---
 app/controllers/people_controller.rb | 5 ++---
 app/controllers/users_controller.rb  | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb
index 5503c2997..352a39c92 100644
--- a/app/controllers/people_controller.rb
+++ b/app/controllers/people_controller.rb
@@ -9,20 +9,19 @@ class PeopleController < ApplicationController
   respond_to :json, :only => [:index, :show]
 
   def index
-    @aspects_dropdown_array = current_user.aspects.collect{|x| [x.to_s, x.id]}
-    @aspect = :all
+    @aspect = :search
     @people = Person.search(params[:q]).paginate :page => params[:page], :per_page => 25, :order => 'created_at DESC'
     respond_with @people
   end
 
   def show
+    @aspect = :profile
     @person = current_user.visible_person_by_id(params[:id])
     unless @person
       render :file => "#{Rails.root}/public/404.html", :layout => false, :status => 404
     else
       @profile = @person.profile
       @aspects_with_person = current_user.aspects_with_person(@person)
-      @aspects_dropdown_array = current_user.aspects.collect{|x| [x.to_s, x.id]}
       @posts = current_user.visible_posts(:person_id => @person.id).paginate :page => params[:page], :order => 'created_at DESC'
       @latest_status_message = current_user.raw_visible_posts.find_all_by__type_and_person_id("StatusMessage", params[:id]).last
       @post_count = @posts.count
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index b9bd53ab5..a0f03877d 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -14,6 +14,7 @@ class UsersController < ApplicationController
   respond_to :html
 
   def edit
+    @aspect  = :user_edit
     @user    = current_user
     @person  = @user.person
     @profile = @user.person.profile