#3570 Started working on new endpoints, but need to merge #3535 to make use of code done there

pull/3595/head
Kartones 10 years ago
parent 917b3b4d22
commit 781333beba

@ -0,0 +1,32 @@
# encoding: UTF-8
module Carto
module Api
class MapsController < ::Api::ApplicationController
ssl_required :show
before_filter :load_map
def show
render_jsonp(@map.public_values)
end
protected
def load_map
# User must be owner or have permissions for the map's visualization
vis = Carto::Visualization.where({
user_id: current_user.id,
map_id: params[:id],
kind: Carto::Visualization::KIND_GEOM
}).first
raise RecordNotFound if vis.nil?
@map = Carto::Map.where(id: params[:id]).first
raise RecordNotFound if @map.nil?
end
end
end
end

@ -34,6 +34,9 @@ class Carto::Visualization < ActiveRecord::Base
TYPE_SLIDE = 'slide'
TYPE_REMOTE = 'remote'
KIND_GEOM = 'geom'
KIND_RASTER = 'raster'
PRIVACY_PUBLIC = 'public'
PRIVACY_PRIVATE = 'private'
PRIVACY_LINK = 'link'

@ -279,6 +279,10 @@ CartoDB::Application.routes.draw do
get '(/user/:user_domain)(/u/:user_domain)/api/v1_1/tables/:table_id/columns' => 'columns#index', as: :api_v1_1_tables_columns_index, constraints: { table_id: /[^\/]+/ }
get '(/user/:user_domain)(/u/:user_domain)/api/v1_1/tables/:table_id/columns/:id' => 'columns#show', as: :api_v1_1_tables_columns_show, constraints: { table_id: /[^\/]+/ }
# Maps
get '(/user/:user_domain)(/u/:user_domain)/api/v1_1/maps/:id' => 'maps#show', as: :api_v1_1_maps_show
end
scope :module => 'api/json', :format => :json do
@ -340,8 +344,6 @@ CartoDB::Application.routes.draw do
get '(/user/:user_domain)(/u/:user_domain)/api/v1/users/:user_id/assets' => 'assets#index', as: :api_v1_users_assets_index
delete '(/user/:user_domain)(/u/:user_domain)/api/v1/users/:user_id/assets/:id' => 'assets#destroy', as: :api_v1_users_assets_destroy
# /api/v1/users/5002ad84-6b3e-4372-996e-b52269ec1cac/assets/b93f1b1e-484c-491b-a22b-c61a76968b63
# Maps
get '(/user/:user_domain)(/u/:user_domain)/api/v1/maps/:id' => 'maps#show', as: :api_v1_maps_show
put '(/user/:user_domain)(/u/:user_domain)/api/v1/maps/:id' => 'maps#update', as: :api_v1_maps_update

Loading…
Cancel
Save