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

aspect tab no longer selected on user#edit and person#show, person#index

Browse source
This commit is contained in:
danielvincent 2010-10-20 10:22:29 -07:00
parent 1bd54aba63
commit e4d6e170e3
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/people_controller.rb
View file

@ -9,20 +9,19 @@ class PeopleController < ApplicationController
respond_to :json, :only => [:index, :show] respond_to :json, :only => [:index, :show]
def index def index
@aspects_dropdown_array = current_user.aspects.collect{|x| [x.to_s, x.id]} @aspect = :search
@aspect = :all
@people = Person.search(params[:q]).paginate :page => params[:page], :per_page => 25, :order => 'created_at DESC' @people = Person.search(params[:q]).paginate :page => params[:page], :per_page => 25, :order => 'created_at DESC'
respond_with @people respond_with @people
end end
def show def show
@aspect = :profile
@person = current_user.visible_person_by_id(params[:id]) @person = current_user.visible_person_by_id(params[:id])
unless @person unless @person
render :file => "#{Rails.root}/public/404.html", :layout => false, :status => 404 render :file => "#{Rails.root}/public/404.html", :layout => false, :status => 404
else else
@profile = @person.profile @profile = @person.profile
@aspects_with_person = current_user.aspects_with_person(@person) @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' @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 @latest_status_message = current_user.raw_visible_posts.find_all_by__type_and_person_id("StatusMessage", params[:id]).last
@post_count = @posts.count @post_count = @posts.count

1
app/controllers/users_controller.rb
View file

@ -14,6 +14,7 @@ class UsersController < ApplicationController
respond_to :html respond_to :html
def edit def edit
@aspect = :user_edit
@user = current_user @user = current_user
@person = @user.person @person = @user.person
@profile = @user.person.profile @profile = @user.person.profile