From: Tom Hughes Date: Thu, 10 Feb 2011 14:10:19 +0000 (+0000) Subject: Merge branch 'master' into openid X-Git-Tag: live~6336^2 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/11aff90f63d79406e9efa1343c965a19dcf5dbba?hp=e09b187cae178c000a683635d408cab72dc3d35b Merge branch 'master' into openid Conflicts: app/controllers/user_controller.rb app/views/user/login.html.erb public/stylesheets/common.css --- diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb index d66fbb28f..95cc88869 100644 --- a/app/controllers/api_controller.rb +++ b/app/controllers/api_controller.rb @@ -46,7 +46,7 @@ class ApiController < ApplicationController root = XML::Node.new 'gpx' root['version'] = '1.0' root['creator'] = 'OpenStreetMap.org' - root['xmlns'] = "http://www.topografix.com/GPX/1/0/" + root['xmlns'] = "http://www.topografix.com/GPX/1/0" doc.root = root diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 6c32b74b2..bc71f275f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -134,8 +134,7 @@ class ApplicationController < ActionController::Base def check_api_readable if STATUS == :database_offline or STATUS == :api_offline - response.headers['Error'] = "Database offline for maintenance" - render :nothing => true, :status => :service_unavailable + report_error "Database offline for maintenance", :service_unavailable return false end end @@ -143,16 +142,14 @@ class ApplicationController < ActionController::Base def check_api_writable if STATUS == :database_offline or STATUS == :database_readonly or STATUS == :api_offline or STATUS == :api_readonly - response.headers['Error'] = "Database offline for maintenance" - render :nothing => true, :status => :service_unavailable + report_error "Database offline for maintenance", :service_unavailable return false end end def require_public_data unless @user.data_public? - response.headers['Error'] = "You must make your edits public to upload new data" - render :nothing => true, :status => :forbidden + report_error "You must make your edits public to upload new data", :forbidden return false end end @@ -165,7 +162,18 @@ class ApplicationController < ActionController::Base def report_error(message, status = :bad_request) # Todo: some sort of escaping of problem characters in the message response.headers['Error'] = message - render :text => message, :status => status + + if request.headers['X-Error-Format'] and + request.headers['X-Error-Format'].downcase == "xml" + result = OSM::API.new.get_xml_doc + result.root.name = "osmError" + result.root << (XML::Node.new("status") << interpret_status(status)) + result.root << (XML::Node.new("message") << message) + + render :text => result.to_s, :content_type => "text/xml" + else + render :text => message, :status => status + end end def set_locale diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb index 9aec1060a..a7dd5f5c9 100644 --- a/app/controllers/browse_controller.rb +++ b/app/controllers/browse_controller.rb @@ -72,8 +72,10 @@ class BrowseController < ApplicationController @next = Changeset.find(:first, :order => "id ASC", :conditions => [ "id > :id", { :id => @changeset.id }] ) @prev = Changeset.find(:first, :order => "id DESC", :conditions => [ "id < :id", { :id => @changeset.id }] ) - @next_by_user = Changeset.find(:first, :order => "id ASC", :conditions => [ "id > :id AND user_id = :user_id", {:id => @changeset.id, :user_id => @changeset.user_id }] ) - @prev_by_user = Changeset.find(:first, :order => "id DESC", :conditions => [ "id < :id AND user_id = :user_id", {:id => @changeset.id, :user_id => @changeset.user_id }] ) + if @changeset.user.data_public? + @next_by_user = Changeset.find(:first, :order => "id ASC", :conditions => [ "id > :id AND user_id = :user_id", { :id => @changeset.id, :user_id => @changeset.user_id }] ) + @prev_by_user = Changeset.find(:first, :order => "id DESC", :conditions => [ "id < :id AND user_id = :user_id", { :id => @changeset.id, :user_id => @changeset.user_id }] ) + end rescue ActiveRecord::RecordNotFound render :action => "not_found", :status => :not_found end diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb index d07b74f11..29e7648af 100644 --- a/app/controllers/geocoder_controller.rb +++ b/app/controllers/geocoder_controller.rb @@ -234,7 +234,7 @@ class GeocoderController < ApplicationController end # ask nominatim - response = fetch_xml("http://nominatim.openstreetmap.org/search?format=xml&q=#{escape_query(query)}#{viewbox}#{exclude}&accept-language=#{request.user_preferred_languages.join(',')}") + response = fetch_xml("#{NOMINATIM_URL}search?format=xml&q=#{escape_query(query)}#{viewbox}#{exclude}&accept-language=#{request.user_preferred_languages.join(',')}") # create result array @results = Array.new @@ -355,7 +355,7 @@ class GeocoderController < ApplicationController @results = Array.new # ask OSM namefinder - response = fetch_xml("http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{request.user_preferred_languages.join(',')}") + response = fetch_xml("#{NOMINATIM_URL}reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{request.user_preferred_languages.join(',')}") # parse the response response.elements.each("reversegeocode/result") do |result| diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index 1478c5773..73f38f78c 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -30,4 +30,41 @@ class SiteController < ApplicationController def key expires_in 7.days, :public => true end + + def edit + editor = params[:editor] || @user.preferred_editor || DEFAULT_EDITOR + + if editor == "remote" + render :action => :index + else + # Decide on a lat lon to initialise potlatch with. Various ways of doing this + if params['lon'] and params['lat'] + @lon = params['lon'].to_f + @lat = params['lat'].to_f + @zoom = params['zoom'].to_i + + elsif params['mlon'] and params['mlat'] + @lon = params['mlon'].to_f + @lat = params['mlat'].to_f + @zoom = params['zoom'].to_i + + elsif params['gpx'] + @lon = Trace.find(params['gpx']).longitude + @lat = Trace.find(params['gpx']).latitude + + elsif cookies.key?("_osm_location") + @lon, @lat, @zoom, layers = cookies["_osm_location"].split("|") + + elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil? + @lon = @user.home_lon + @lat = @user.home_lat + + else + #catch all. Do nothing. lat=nil, lon=nil + #Currently this results in potlatch starting up at 0,0 (Atlantic ocean). + end + + @zoom = '14' if @zoom.nil? + end + end end diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index d456c1353..1193ec910 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -108,6 +108,7 @@ class UserController < ApplicationController if @user.save flash[:notice] = t 'user.new.flash create success message', :email => @user.email Notifier.deliver_signup_confirm(@user, @user.tokens.create(:referer => session.delete(:referer))) + session[:token] = @user.tokens.create.token redirect_to :action => 'login' else render :action => 'new' @@ -139,6 +140,12 @@ class UserController < ApplicationController @user.home_lat = params[:user][:home_lat] @user.home_lon = params[:user][:home_lon] + if params[:user][:preferred_editor] == "default" + @user.preferred_editor = nil + else + @user.preferred_editor = params[:user][:preferred_editor] + end + @user.openid_url = nil if params[:user][:openid_url].empty? if params[:user][:openid_url].length > 0 and @@ -283,14 +290,29 @@ class UserController < ApplicationController user.save! referer = token.referer token.destroy - session[:user] = user.id - unless referer.nil? + if session[:token] + token = UserToken.find_by_token(session[:token]) + session.delete(:token) + else + token = nil + end + + if token.nil? or token.user != user flash[:notice] = t('user.confirm.success') - redirect_to referer + redirect_to :action => :login, :referer => referer else - flash[:notice] = t('user.confirm.success') + "

" + t('user.confirm.before you start') - redirect_to :action => 'account', :display_name => user.display_name + token.destroy + + session[:user] = user.id + + if referer.nil? + flash[:notice] = t('user.confirm.success') + "

" + t('user.confirm.before you start') + redirect_to :action => :account, :display_name => user.display_name + else + flash[:notice] = t('user.confirm.success') + redirect_to referer + end end end else diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 2ccfcca2b..c24e7ff5b 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -119,6 +119,16 @@ module ApplicationHelper end end + def preferred_editor + if params[:editor] + params[:editor] + elsif @user and @user.preferred_editor + @user.preferred_editor + else + DEFAULT_EDITOR + end + end + private def javascript_strings_for_key(key) diff --git a/app/models/client_application.rb b/app/models/client_application.rb index 9474a0137..09eec40d3 100644 --- a/app/models/client_application.rb +++ b/app/models/client_application.rb @@ -2,6 +2,7 @@ require 'oauth' class ClientApplication < ActiveRecord::Base belongs_to :user has_many :tokens, :class_name => "OauthToken" + has_many :access_tokens validates_presence_of :name, :url, :key, :secret validates_uniqueness_of :key before_validation_on_create :generate_keys @@ -53,6 +54,20 @@ class ClientApplication < ActiveRecord::Base RequestToken.create :client_application => self, :callback_url => self.token_callback_url end + def access_token_for_user(user) + unless token = access_tokens.find(:first, :conditions => { :user_id => user.id, :invalidated_at => nil }) + params = { :user => user } + + permissions.each do |p| + params[p] = true + end + + token = access_tokens.create(params) + end + + token + end + # the permissions that this client would like from the user def permissions ClientApplication.all_permissions.select { |p| self[p] } diff --git a/app/models/user.rb b/app/models/user.rb index d5b75d073..79af5d71f 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -10,7 +10,7 @@ class User < ActiveRecord::Base has_many :friends, :include => :befriendee, :conditions => "users.status IN ('active', 'confirmed')" has_many :tokens, :class_name => "UserToken" has_many :preferences, :class_name => "UserPreference" - has_many :changesets + has_many :changesets, :order => 'created_at DESC' has_many :client_applications has_many :oauth_tokens, :class_name => "OauthToken", :order => "authorized_at desc", :include => [:client_application] @@ -34,6 +34,7 @@ class User < ActiveRecord::Base validates_numericality_of :home_lat, :allow_nil => true validates_numericality_of :home_lon, :allow_nil => true validates_numericality_of :home_zoom, :only_integer => true, :allow_nil => true + validates_inclusion_of :preferred_editor, :in => Editors::ALL_EDITORS, :allow_nil => true before_save :encrypt_password @@ -107,7 +108,7 @@ class User < ActiveRecord::Base (languages & array.collect { |i| i.to_s }).first end - def nearby(radius = 50, num = 10) + def nearby(radius = NEARBY_RADIUS, num = NEARBY_USERS) if self.home_lon and self.home_lat gc = OSM::GreatCircle.new(self.home_lat, self.home_lon) bounds = gc.bounds(radius) @@ -203,4 +204,10 @@ class User < ActiveRecord::Base return score.to_i end + + ## + # return an oauth access token for a specified application + def access_token(application_key) + return ClientApplication.find_by_key(application_key).access_token_for_user(self) + end end diff --git a/app/views/browse/_changeset_details.html.erb b/app/views/browse/_changeset_details.html.erb index 6e3cbdb2e..9fb9cb860 100644 --- a/app/views/browse/_changeset_details.html.erb +++ b/app/views/browse/_changeset_details.html.erb @@ -84,7 +84,7 @@ <% @relations.each do |relation| %> - + <% end %>
<%= link_to h(printable_name(relation, true)), { :action => "relation", :id => relation.id.to_s }, :class => "relation " %>
<%= link_to h(printable_name(relation, true)), { :action => "relation", :id => relation.id.to_s }, :class => link_class('relation', relation), :title => link_title(relation) %>
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb index b514fef99..4497e7e81 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -5,6 +5,7 @@ <%= javascript_strings %> <%= javascript_include_tag 'prototype' %> <%= javascript_include_tag 'site' %> + <%= javascript_include_tag 'menu' %> <%= stylesheet_link_tag 'common' %> @@ -73,6 +74,18 @@ +
+ +
+ + +