Merge pull request #11642 from CartoDB/c1698-show_api_keys_dropdown

C1698 show api keys dropdown
pull/11675/head
Juan Ignacio Sánchez Lara 8 years ago committed by GitHub
commit e00c35b6e1

@ -168,7 +168,8 @@ module Carto
google_maps_geocoder_enabled: @user.google_maps_geocoder_enabled?, google_maps_geocoder_enabled: @user.google_maps_geocoder_enabled?,
google_maps_enabled: @user.google_maps_enabled?, google_maps_enabled: @user.google_maps_enabled?,
engine_enabled: @user.engine_enabled?, engine_enabled: @user.engine_enabled?,
builder_enabled: @user.builder_enabled? builder_enabled: @user.builder_enabled?,
mobile_sdk_enabled: @user.mobile_sdk_enabled?
}, },
limits: { limits: {
concurrent_syncs: CartoDB::PlatformLimits::Importer::UserConcurrentSyncsAmount::MAX_SYNCS_PER_USER, concurrent_syncs: CartoDB::PlatformLimits::Importer::UserConcurrentSyncsAmount::MAX_SYNCS_PER_USER,

@ -98,7 +98,8 @@ module CartoDB
google_maps_geocoder_enabled: google_maps_geocoder_enabled?, google_maps_geocoder_enabled: google_maps_geocoder_enabled?,
google_maps_enabled: google_maps_enabled?, google_maps_enabled: google_maps_enabled?,
engine_enabled: engine_enabled?, engine_enabled: engine_enabled?,
builder_enabled: builder_enabled? builder_enabled: builder_enabled?,
mobile_sdk_enabled: mobile_sdk_enabled?
}, },
limits: { limits: {
concurrent_syncs: CartoDB::PlatformLimits::Importer::UserConcurrentSyncsAmount::MAX_SYNCS_PER_USER, concurrent_syncs: CartoDB::PlatformLimits::Importer::UserConcurrentSyncsAmount::MAX_SYNCS_PER_USER,

@ -50,7 +50,7 @@
<% if (isOrgAdmin) { %> <% if (isOrgAdmin) { %>
<li class="u-bSpace--m"><a href="<%- organizationUrl %>">Your organization</a></li> <li class="u-bSpace--m"><a href="<%- organizationUrl %>">Your organization</a></li>
<% } %> <% } %>
<% if (engineEnabled) { %> <% if (engineEnabled || mobileAppsEnabled) { %>
<li class="u-bSpace--m"><a href="<%- apiKeysUrl %>">Your API keys</a></li> <li class="u-bSpace--m"><a href="<%- apiKeysUrl %>">Your API keys</a></li>
<% } %> <% } %>
<li><a href="<%- logoutUrl %>">Close session</a></li> <li><a href="<%- logoutUrl %>">Close session</a></li>

@ -88,7 +88,8 @@ module.exports = cdb.admin.DropdownMenu.extend({
isViewer: user.isViewer(), isViewer: user.isViewer(),
isBuilder: user.isBuilder(), isBuilder: user.isBuilder(),
orgDisplayEmail: user.isInsideOrg() ? user.organization.display_email : null, orgDisplayEmail: user.isInsideOrg() ? user.organization.display_email : null,
engineEnabled: user.get('actions').engine_enabled engineEnabled: user.get('actions').engine_enabled,
mobileAppsEnabled: user.get('actions').mobile_sdk_enabled
})); }));
// Necessary to hide dialog on click outside popup, for example. // Necessary to hide dialog on click outside popup, for example.

Loading…
Cancel
Save