Fix mobile getting_started use wrong person object

This commit is contained in:
cmrd Senya 2016-07-21 12:12:31 +00:00
parent 71ecd7b866
commit d7fd735ee0
No known key found for this signature in database
GPG key ID: 5FCC5BA680E67BFE
3 changed files with 7 additions and 5 deletions

View file

@ -12,8 +12,8 @@ module InvitationCodesHelper
def invited_by_message
inviter = current_user.invited_by
if inviter.present?
contact = current_user.contact_for(inviter.person) || Contact.new
render :partial => 'people/add_contact', :locals => {:inviter => inviter.person, :contact => contact}
@person = inviter.person
render partial: "people/add_contact"
end
end
end

View file

@ -2,8 +2,8 @@
= t('.invited_by')
.media
.pull-right
= render partial: "aspect_memberships/aspect_membership_dropdown", locals: {person: inviter}
= render partial: "aspect_memberships/aspect_membership_dropdown"
.media-left
= person_image_link(inviter, size: :thumb_small, class: "media-object")
= person_image_link(@person, size: :thumb_small, class: "media-object")
.media-body
= person_link(inviter)
= person_link(@person)

View file

@ -12,3 +12,5 @@ Feature: Invitations
And I press "Create account"
Then I should see the "welcome to diaspora" message
And I should be able to friend "alice@alice.alice"
When I select "Family" from "user_aspects" within "#hello-there"
Then the aspect dropdown within "#hello-there" should be labeled "Family"