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

kinda refactor another sucky controller method

Browse source
This commit is contained in:
Maxwell Salzberg 2012-01-27 00:25:45 -08:00
parent cc5334ce9a
commit 8002091d67
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
app/controllers/aspects_controller.rb
View file

@ -10,22 +10,16 @@ class AspectsController < ApplicationController
:json :json
def create def create
@aspect = current_user.aspects.create(params[:aspect]) @aspect = current_user.aspects.build(params[:aspect])
aspecting_person_id = params[:aspect][:person_id]
if @aspect.valid? if @aspect.save
flash[:notice] = I18n.t('aspects.create.success', :name => @aspect.name) flash[:notice] = I18n.t('aspects.create.success', :name => @aspect.name)
if current_user.getting_started
redirect_to :back
elsif request.env['HTTP_REFERER'].include?("contacts")
redirect_to :back
elsif params[:aspect][:person_id].present?
@person = Person.where(:id => params[:aspect][:person_id]).first
if @contact = current_user.contact_for(@person) if current_user.getting_started || request.referer.include?("contacts")
@contact.aspects << @aspect redirect_to :back
else elsif aspecting_person_id.present?
@contact = current_user.share_with(@person, @aspect) connect_person_to_aspect(aspecting_person_id)
end
else else
redirect_to contacts_path(:a_id => @aspect.id) redirect_to contacts_path(:a_id => @aspect.id)
end end
@ -40,6 +34,16 @@ class AspectsController < ApplicationController
end end
end end
#person_id, user, @aspect
def connect_person_to_aspect(aspecting_person_id)
@person = Person.find(aspecting_person_id)
if @contact = current_user.contact_for(@person)
@contact.aspects << @aspect
else
@contact = current_user.share_with(@person, @aspect)
end
end
def new def new
@aspect = Aspect.new @aspect = Aspect.new
@person_id = params[:person_id] @person_id = params[:person_id]