- added preferences action to user
- added column preferences to user table
class UserController < ApplicationController
layout 'site'
class UserController < ApplicationController
layout 'site'
+
+ before_filter :authorize, :only => :preferences
def save
@user = User.new(params[:user])
def save
@user = User.new(params[:user])
+ def preferences
+ if request.get?
+ render_text @user.preferences
+ elsif request.post? or request.put?
+ @user.preferences = request.raw_post
+ @user.save!
+ render :nothing => true
+ else
+ render :status => 400, :nothing => true
+ end
+ end
@recipients = user.email
@from = 'abuse@openstreetmap.org'
@subject = '[OpenStreetMap] Confirm your email address'
@recipients = user.email
@from = 'abuse@openstreetmap.org'
@subject = '[OpenStreetMap] Confirm your email address'
- @body['url'] = 'http://www.openstreetmap.org/user/confirm?confirm_string=' + user.token
+ @body['url'] = "http://#{SERVER_URL}/user/confirm?confirm_string=#{user.token}"
end
def lost_password( user )
@recipients = user.email
@from = 'abuse@openstreetmap.org'
@subject = '[OpenStreetMap] Password reset request'
end
def lost_password( user )
@recipients = user.email
@from = 'abuse@openstreetmap.org'
@subject = '[OpenStreetMap] Password reset request'
- @body['url'] = "http://www.openstreetmap.org/user/reset_password?email=#{user.email}&token=#{user.token}"
+ @body['url'] = "http://#{SERVER_URL}/user/reset_password?email=#{user.email}&token=#{user.token}"
end
def reset_password(user, pass)
end
def reset_password(user, pass)
Hi,
Somone (hopefully you) would like to create an account over at
Hi,
Somone (hopefully you) would like to create an account over at
If this is you, please click the link below to confirm that account.
If this is you, please click the link below to confirm that account.
function init(){
OpenLayers.Util.onImageLoadError = function() {
function init(){
OpenLayers.Util.onImageLoadError = function() {
- this.src = "http://www.openstreetmap.org/javascript/img/404.png";
+ this.src = "http://<%= SERVER_URL %>/javascript/img/404.png";
}
map = new OpenLayers.Map( "map",
{maxExtent: new OpenLayers.Bounds(-20037508.34,-20037508.34,20037508.34,20037508.34), maxResolution:156543, units:'meters', projection: "EPSG:41001"} );
}
map = new OpenLayers.Map( "map",
{maxExtent: new OpenLayers.Bounds(-20037508.34,-20037508.34,20037508.34,20037508.34), maxResolution:156543, units:'meters', projection: "EPSG:41001"} );
-<span class="rsssmall"><a href="<%= url_for :controller => 'trace', :action => 'georss' %>"><img src="http://www.openstreetmap.org/images/RSS.gif" border="0"></a></span> |
+<span class="rsssmall"><a href="<%= url_for :controller => 'trace', :action => 'georss' %>"><img src="http://<%= SERVER_URL %>/images/RSS.gif" border="0"></a></span> |
<% if @user %>
<%= link_to 'See just your traces', {:controller => 'trace', :action => 'mine'} %>
<% else %>
<% if @user %>
<%= link_to 'See just your traces', {:controller => 'trace', :action => 'mine'} %>
<% else %>
# Include your application configuration below
# Include your application configuration below
+API_VERSION = ENV['OSM_API_VERSION'] || '0.4'
+SERVER_URL = ENV['OSM_SERVER_URL'] || 'www.openstreetmap.org'
ActionMailer::Base.server_settings = {
:address => "localhost",
ActionMailer::Base.server_settings = {
:address => "localhost",
create index gpx_file_tags_gpxid_idx on gpx_file_tags(gpx_id);
alter table gpx_file_tags add id int(20) auto_increment not null, add primary key(id);
create index gpx_file_tags_gpxid_idx on gpx_file_tags(gpx_id);
alter table gpx_file_tags add id int(20) auto_increment not null, add primary key(id);
+alter table users add preferences text;