Migrate absolute_public_url to old model

pull/11248/head
Javier Torres 8 years ago
parent 5a36f5ccbb
commit 44cc852f75

@ -165,8 +165,19 @@ class Asset < Sequel::Model
ASSET_SUBFOLDER = 'uploads'.freeze
def absolute_public_url
uri = URI.parse(public_url)
(uri.absolute? ? uri : URI.join(base_domain, uri)).to_s
rescue URI::InvalidURIError
public_url
end
private
def base_domain
CartoDB.base_domain_from_name(user ? user.subdomain : organization.name)
end
def chmod_mode
# Example in case asset kind should change mode
# kind == KIND_ORG_AVATAR ? 0644 : nil

@ -32,6 +32,8 @@ module Carto
def absolute_public_url
uri = URI.parse(public_url)
(uri.absolute? ? uri : URI.join(base_domain, uri)).to_s
rescue URI::InvalidURIError
public_url
end
private

Loading…
Cancel
Save