Add user's database location in profile

pull/16349/head
Moisés Calzado 3 years ago
parent ae00d165ae
commit 066a0e3ad0

@ -14,6 +14,7 @@ Development
* Bump cartodb-common to v1.1.2
* Include DB connections, all parameters for Oauth connections, and the relationship between synchronizations and connections, in User migrations [#16287](https://github.com/CartoDB/cartodb/pull/16287)
* Upgrade to CARTO Viewer v1.0.8 [16347](https://github.com/CartoDB/cartodb/pull/16347)
* Show user's database location in profile [16348](https://github.com/CartoDB/cartodb/pull/16348)
### Bug fixes / enhancements
- Add "element" param to DO-Catalog entry function [#16343](https://github.com/CartoDB/cartodb/pull/16343)

@ -496,7 +496,16 @@ $sLabel-width: 140px;
flex-direction: column;
align-items: baseline;
justify-content: space-between;
margin-top: 20px;
}
.FormAccount-databaseLocation {
margin-top: 24px;
margin-bottom: 8px;
text-align: left;
}
.FormAccount-databaseLocationText {
font-size: 13px;
}
.FormAccount-avatarPreview {

@ -6,7 +6,7 @@ module FrontendConfigHelper
def frontend_config_hash(user = current_user)
config = {
region: Cartodb.get_config(:bigquery_region),
region: Cartodb.get_config(:bigquery_region) ? Cartodb.get_config(:bigquery_region).upcase : nil,
app_assets_base_url: app_assets_base_url,
maps_api_template: maps_api_template,
maps_api_v2_template: maps_api_v2_template,

@ -506,7 +506,16 @@ $sLabel-width: 140px;
flex-direction: column;
align-items: baseline;
justify-content: space-between;
margin-top: 20px;
}
.FormAccount-databaseLocation {
margin-top: 24px;
margin-bottom: 8px;
text-align: left;
}
.FormAccount-databaseLocationText {
font-size: 13px;
}
.FormAccount-avatarPreview {

@ -32,7 +32,12 @@
<span class="UserRoleIndicator Builder CDB-Text CDB-Size-small is-semibold u-altTextColor"><%= _t('profile.views.form.builder') %></span>
<p class="CDB-Text CDB-Size-small u-altTextColor u-tSpace"><%= _t('profile.views.form.write_access') %></p>
<% if (region) { %>
<p class="CDB-Text CDB-Size-small u-altTextColor u-tSpace"><i class="CDB-IconFont CDB-IconFont-globe CDB-IconFont--withLabel"></i> <%= region %> </p>
<div class="FormAccount-rowData FormAccount-userRole">
<div class="FormAccount-databaseLocation">
<label class="CDB-Text CDB-Size-medium is-semibold u-mainTextColor"><%= _t('profile.views.form.database_location') %></label>
</div>
<p class="FormAccount-databaseLocationText"><%= region %> </p>
</div>
<% } %>
<% } else { %>
<!-- for custom role names (via gears) -->

@ -114,6 +114,7 @@
"use_case": "Use case",
"phone": "Phone Number",
"user_type": "User type",
"database_location": "Database location",
"viewer": "VIEWER",
"read_only": "Read-only access for datasets and maps",
"builder": "BUILDER",
@ -2969,4 +2970,4 @@
"adding": "Adding geometry…"
}
}
}
}

Loading…
Cancel
Save