saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor fix for emailers and facebook

This commit is contained in:
Harry Bomrah 2013-11-29 19:35:39 +08:00 committed by saurabhbhatia
parent 685f696536
commit 8c4d6b972a
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/facebook_controller.rb
View File

@ -59,7 +59,7 @@ class FacebookController< ApplicationController
data = JSON.parse(friends) data = JSON.parse(friends)
if data["success"] if data["success"]
user = JSON.parse(data["user"]) user = JSON.parse(data["user"])
u = User.find(current_user.id) u = User.find(temp_user.id)
firstname = {} firstname = {}
lastname = {} lastname = {}
@site_valid_locales.each do |locale| @site_valid_locales.each do |locale|
@ -87,7 +87,7 @@ class FacebookController< ApplicationController
end end
def server_redirect def server_redirect
@url = "#{@@facebook_server}/login?callback=#{request.protocol}#{request.host_with_port}/facebook/register_fb?user="+current_user.id.to_s rescue nil @url = "#{@@facebook_server}/login?callback=#{request.protocol}#{request.host_with_port}/facebook/register_fb?user="+params[:user_id] rescue nil
if !@url.nil? if !@url.nil?
redirect_to @url redirect_to @url
else else

2
app/views/basic_infos/index.html.erb
View File

@ -23,7 +23,7 @@
var facebookWindow = null, var facebookWindow = null,
timeInterval = null; timeInterval = null;
$("a.facebook").click(function(){ $("a.facebook").click(function(){
facebookWindow = window.open('<%= facebook_server_path %>','login_window','height=668,width=1124,titlebar=0,statusbar=0,location=0'); facebookWindow = window.open('<%= facebook_server_path(:user_id=>@user.id.to_s) %>','login_window','height=668,width=1124,titlebar=0,statusbar=0,location=0');
clearInterval(timeInterval); clearInterval(timeInterval);
timeInterval = setInterval(function(){ timeInterval = setInterval(function(){
if( facebookWindow.closed ){ if( facebookWindow.closed ){

2
config/environments/development.rb
View File

@ -25,7 +25,7 @@ Orbit::Application.configure do
# config.cache_store = :mem_cache_store # config.cache_store = :mem_cache_store
config.action_mailer.default_url_options = { :host => 'localhost:3000' } config.action_mailer.default_url_options = { :host => 'harry.tp.rulingcom.com' }
config.assets.debug = false config.assets.debug = false