diff --git a/app/controllers/services_controller.rb b/app/controllers/services_controller.rb index 43ac6fc2254337bbf32844706c36dd60e8909933..3e96a1a749d1271b457544bcaeb636572c7aee92 100644 --- a/app/controllers/services_controller.rb +++ b/app/controllers/services_controller.rb @@ -71,7 +71,8 @@ class ServicesController < ApplicationController su.save respond_to do |format| - format.json{ render :json => invite_redirect_url(invite, invited_user, su) } + format.html{ invite_redirect_url(invite, invited_user, su)} + format.json{ render :json => invite_redirect_json(invite, invited_user, su) } end end @@ -86,11 +87,19 @@ MSG "https://www.facebook.com/?compose=1&id=#{facebook_uid}&subject=#{subject}&message=#{message}&sk=messages" end - def invite_redirect_url(invite, user, service_user) + def invite_redirect_json(invite, user, service_user) if invite.email_like_identifer {:message => t("invitations.create.sent") + service_user.name } else {:url => facebook_message_url(user, service_user.uid)} end end + + def invite_redirect_url(invite, user, service_user) + if invite.email_like_identifer + redirect_to(friend_finder_path(:provider => 'facebook'), :notice => "you re-invited #{service_user.name}") + else + redirect_to(facebook_message_url(user, service_user.uid)) + end + end end diff --git a/app/views/services/_remote_friend.html.haml b/app/views/services/_remote_friend.html.haml index ad9ad73b71d2309dd936c6b2276cf4467b01e9b4..86abd04ed97e5aab8d59c700bfb74c3c5df299da 100644 --- a/app/views/services/_remote_friend.html.haml +++ b/app/views/services/_remote_friend.html.haml @@ -2,8 +2,7 @@ .right - if friend.already_invited? - .button.resend - = link_to t('.resend'), service_inviter_path(:uid => friend.uid, :provider => 'facebook', :invitation_id => friend.invitation_id, :format => :json) + = link_to t('.resend'), service_inviter_path(:uid => friend.uid, :provider => 'facebook', :invitation_id => friend.invitation_id), :class => 'button resend' - elsif friend.on_diaspora? = render 'shared/aspect_dropdown', :selected_aspects => contact_proxy(friend).aspects, :person => friend.person, :hang => 'left' - else diff --git a/public/javascripts/contact-edit.js b/public/javascripts/contact-edit.js index 9cbf94eb6b2559ce8d41887c48126ca44d49cbea..2e09fac6a9a9626fc496fdf5760d862ed5d8a213 100644 --- a/public/javascripts/contact-edit.js +++ b/public/javascripts/contact-edit.js @@ -8,14 +8,14 @@ var ContactEdit = { $('.dropdown.aspect_membership .dropdown_list > li').live('click', function(evt){ ContactEdit.processClick($(this), evt); }); - $('.button.resend').live('click', function(evt){ - evt.preventDefault(); - $.post($(this).href, {}, - function(data){ - console.log(data); - ContactEdit.processSuccess($(this), evt, data) - }); - }); + // $('.button.resend').live('click', function(evt){ + // evt.preventDefault(); + // $.post($(this).href, {}, + // function(data){ + // console.log(data); + // ContactEdit.processSuccess($(this), evt, data) + // }); + // }); }, processClick: function(li, evt){ @@ -34,7 +34,7 @@ var ContactEdit = { "aspect_id" : li.data("aspect_id"), "uid" : li.parent().data("service_uid") }, function(data){ - processSuccess(li, evt, data); + ContactEdit.processSuccess(li, evt, data); }); }, diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 78026adb135ae70afc5c8d399f96e23f36273401..cbbcf9df8f1cf5d747ac378b6f0cce8e7d0c6dca 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -3397,3 +3397,10 @@ ul#getting_started .green :color green +// .resend +// :color black +// &:hover +// :text-decoration none +// :color black +// &:hover +// :text-decoration none