X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/951564eed1c82ec1a435f4e4636db86d1b7604fc..bf9dd8f350ca1b54afb79dda79506d980ccb5738:/app/controllers/api/users_controller.rb diff --git a/app/controllers/api/users_controller.rb b/app/controllers/api/users_controller.rb index f24d50cf1..d3387bd5f 100644 --- a/app/controllers/api/users_controller.rb +++ b/app/controllers/api/users_controller.rb @@ -2,29 +2,29 @@ module Api class UsersController < ApiController layout "site", :except => [:api_details] - before_action :disable_terms_redirect, :only => [:api_details] - before_action :authorize, :only => [:api_details, :api_gpx_files] + before_action :disable_terms_redirect, :only => [:details] + before_action :authorize, :only => [:details, :gpx_files] authorize_resource before_action :check_api_readable around_action :api_call_handle_error - before_action :lookup_user_by_id, :only => [:api_read] + before_action :lookup_user_by_id, :only => [:show] - def api_read + def show if @user.visible? - render :action => :api_read, :content_type => "text/xml" + render :content_type => "text/xml" else head :gone end end - def api_details + def details @user = current_user - render :action => :api_read, :content_type => "text/xml" + render :action => :show, :content_type => "text/xml" end - def api_users + def index raise OSM::APIBadUserInput, "The parameter users is required, and must be of the form users=id[,id[,id...]]" unless params["users"] ids = params["users"].split(",").collect(&:to_i) @@ -33,15 +33,12 @@ module Api @users = User.visible.find(ids) - render :action => :api_users, :content_type => "text/xml" + render :content_type => "text/xml" end - def api_gpx_files - doc = OSM::API.new.get_xml_doc - current_user.traces.reload.each do |trace| - doc.root << trace.to_xml_node - end - render :xml => doc.to_s + def gpx_files + @traces = current_user.traces.reload + render :content_type => "application/xml" end private