add data_library_url to config

pull/6418/head
Carlos Matallín 9 years ago
parent 7bc440eb8a
commit ce769c8c08

@ -176,6 +176,8 @@ class Admin::VisualizationsController < Admin::AdminController
# Public export API SQL url
@export_sql_api_url = "#{ sql_api_url("SELECT * FROM #{ @table.owner.sql_safe_database_schema }.#{ @table.name }", @user) }&format=shp"
@data_library_url = CartoDB.data_library_path.nil? ? nil : "#{request.protocol}#{CartoDB.account_host}#{CartoDB.data_library_path}"
respond_to do |format|
format.html { render 'public_dataset', layout: 'application_table_public' }
end

@ -100,24 +100,40 @@
<div class="PublicMap-gradient"></div>
<div class="PublicMap-leftBlock PublicMap-leftBlock--owner">
<ul class="Navmenu-list Navmenu-list--owner Navmenu-list--avatar">
<li class="Navmenu-item">
<a href="<%= CartoDB.url(self, 'public_user_feed_home', {}, @visualization.user) %>" target="_blank" class="UserAvatar">
<img class="UserAvatar-img--medium" src="<%= @visualization.user.avatar %>" alt="<%= @name %>" title="<%= @name %>" />
</a>
</li>
</ul>
<% if @viewed_user.has_feature_flag?("data_library") && @data_library_url %>
<ul class="Navmenu-list Navmenu-list--owner Navmenu-list--avatar">
<li class="Navmenu-item">
<a href="<%= @data_library_url %>" class="UserAvatar">
<img class="UserAvatar-img--medium" src="<%= @visualization.user.avatar %>" alt="Data Library" title="Data Library" />
</a>
</li>
</ul>
<ul class="Navmenu-list Navmenu-list--owner">
<li class="Navmenu-item u-hideOnTablet last-child">
<a href="<%= CartoDB.url(self, 'public_user_feed_home', {}, @visualization.user) %>" class="Navmenu-link Navmenu-link--owner" title="<%= @name %>"><%= @name %></a>
</li>
<ul class="Navmenu-list Navmenu-list--owner">
<li class="Navmenu-item u-hideOnTablet last-child">
<a href="<%= @data_library_url %>" class="Navmenu-link Navmenu-link--owner" title="Data Library">Data Library</a>
</li>
</ul>
<% else %>
<ul class="Navmenu-list Navmenu-list--owner Navmenu-list--avatar">
<li class="Navmenu-item">
<a href="<%= CartoDB.url(self, 'public_user_feed_home', {}, @visualization.user) %>" class="UserAvatar">
<img class="UserAvatar-img--medium" src="<%= @visualization.user.avatar %>" alt="<%= @name %>" title="<%= @name %>" />
</a>
</li>
</ul>
<li class="Navmenu-item">
<i class="Navmenu-rarrow iconFont iconFont-Rarrow"></i>
<a href="<%= CartoDB.url(self, 'public_datasets_home', {}, @visualization.user) %>" class="Navmenu-link">Datasets</a>
</li>
</ul>
<ul class="Navmenu-list Navmenu-list--owner">
<li class="Navmenu-item u-hideOnTablet last-child">
<a href="<%= CartoDB.url(self, 'public_user_feed_home', {}, @visualization.user) %>" class="Navmenu-link Navmenu-link--owner" title="<%= @name %>"><%= @name %></a>
</li>
<li class="Navmenu-item">
<i class="Navmenu-rarrow iconFont iconFont-Rarrow"></i>
<a href="<%= CartoDB.url(self, 'public_datasets_home', {}, @visualization.user) %>" class="Navmenu-link">Datasets</a>
</li>
</ul>
<% end %>
</div>
<div class="PublicMap-rightBlock PublicMap-rightBlock--owner u-txt-right">

@ -17,6 +17,7 @@ defaults: &defaults
secret_token: '71c2b25921b84a1cb21c71503ab8fb23'
account_host: 'localhost.lan:3000'
account_path: '/account'
data_library_path: '/data-library'
disable_file: '~/disable'
watcher:
ttl: 60

@ -119,6 +119,10 @@ module CartoDB
@@account_path ||= self.get_account_path
end
def self.data_library_path
@@data_library_path ||= self.get_data_library_path
end
def self.request_host=(value)
@@request_host=value
end
@ -225,5 +229,9 @@ module CartoDB
Cartodb.config[:account_path]
end
def self.get_data_library_path
Cartodb.config[:data_library_path]
end
end

@ -14,6 +14,7 @@ module CartoDB
remove_class_variable(:@@subdomainless_urls) if defined?(@@subdomainless_urls)
remove_class_variable(:@@account_host) if defined?(@@account_host)
remove_class_variable(:@@account_path) if defined?(@@account_path)
remove_class_variable(:@@data_library_path) if defined?(@@data_library_path)
end
end

Loading…
Cancel
Save