share with action for people who are already on diaspora
This commit is contained in:
parent
605e70f095
commit
a8ac403e30
3 changed files with 12 additions and 0 deletions
|
|
@ -42,6 +42,7 @@ class PeopleController < ApplicationController
|
||||||
def show
|
def show
|
||||||
@person = Person.where(:id => params[:id]).first
|
@person = Person.where(:id => params[:id]).first
|
||||||
@post_type = :all
|
@post_type = :all
|
||||||
|
@share_with = (params[:share_with] == 'true')
|
||||||
|
|
||||||
if @person
|
if @person
|
||||||
@incoming_request = current_user.request_from(@person)
|
@incoming_request = current_user.request_from(@person)
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,9 @@
|
||||||
:id => @person.id},
|
:id => @person.id},
|
||||||
:class => 'share_with button',
|
:class => 'share_with button',
|
||||||
:rel => 'facebox'
|
:rel => 'facebox'
|
||||||
|
- if @share_with
|
||||||
|
= javascript_tag "$(document).ready(function() {jQuery.facebox({ ajax: '#{share_with_path(:id => @person.id)}' });});"
|
||||||
|
|
||||||
|
|
||||||
- else
|
- else
|
||||||
.right
|
.right
|
||||||
|
|
|
||||||
|
|
@ -32,6 +32,14 @@
|
||||||
= t('invitations.new.already_invited')
|
= t('invitations.new.already_invited')
|
||||||
%br
|
%br
|
||||||
= link_to t('.resend'), service_inviter_path(:uid => uid, :provider => 'facebook', :invitation_id => friend[:invitation_id])
|
= link_to t('.resend'), service_inviter_path(:uid => uid, :provider => 'facebook', :invitation_id => friend[:invitation_id])
|
||||||
|
- elsif friend[:person]
|
||||||
|
= link_to t('people.show.start_sharing'),
|
||||||
|
{:controller => "people",
|
||||||
|
:action => "show",
|
||||||
|
:id => friend[:person].id,
|
||||||
|
:share_with => true},
|
||||||
|
:class => 'button'
|
||||||
|
|
||||||
- elsif current_user.invites > 0
|
- elsif current_user.invites > 0
|
||||||
= form_tag service_inviter_path do
|
= form_tag service_inviter_path do
|
||||||
= select_tag(:aspect_id, options_from_collection_for_select(@all_aspects, 'id', 'name'))
|
= select_tag(:aspect_id, options_from_collection_for_select(@all_aspects, 'id', 'name'))
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue