cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pass editing params through to welcome page

Browse source
This commit is contained in:
John Firebaugh 2013-08-02 14:36:38 -07:00
parent 901de4a56a
commit 2fa4225784
2 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/assets/javascripts/welcome.js
View file

@ -21,7 +21,14 @@ $(document).ready(function() {
} }
}); });
$('.start-mapping').attr('href', '/edit?zoom=17&lat=' + params.lat + '&lon=' + params.lon); params = {
lat: params.lat,
lon: params.lon,
zoom: params.zoom || 17,
editor: params.editor
};
$('.start-mapping').attr('href', '/edit?' + $.param(params));
} else if (navigator.geolocation) { } else if (navigator.geolocation) {
$('.edit-geolocated').show(); $('.edit-geolocated').show();

11
app/controllers/user_controller.rb
View file

@ -88,12 +88,19 @@ class UserController < ApplicationController
if @user.save if @user.save
flash[:piwik_goal] = PIWIK_SIGNUP_GOAL if defined?(PIWIK_SIGNUP_GOAL) flash[:piwik_goal] = PIWIK_SIGNUP_GOAL if defined?(PIWIK_SIGNUP_GOAL)
begin
referer_params = Rack::Utils.parse_query(URI(session[:referer]).query)
referer = welcome_path(referer_params.slice(:lat, :lon, :zoom, :editor))
rescue
referer = welcome_path
end
if @user.status == "active" if @user.status == "active"
session[:referer] = welcome_path session[:referer] = referer
successful_login(@user) successful_login(@user)
else else
session[:token] = @user.tokens.create.token session[:token] = @user.tokens.create.token
Notifier.signup_confirm(@user, @user.tokens.create(:referer => welcome_path)).deliver Notifier.signup_confirm(@user, @user.tokens.create(:referer => referer)).deliver
redirect_to :action => 'confirm', :display_name => @user.display_name redirect_to :action => 'confirm', :display_name => @user.display_name
end end
else else