Redirects to organization forget link if organization is present

pull/14891/head
Juan Ignacio Sánchez Lara 5 years ago
parent df8f60f8c5
commit bea065e0c1

@ -15,6 +15,7 @@ Development
- Fix map list style inside the delete dataset dialog [#14685](https://github.com/CartoDB/cartodb/issues/14685)
- Update database_host IP for every user from a server rake [#14854](https://github.com/CartoDB/cartodb/pull/14854)
- Fix paging parameters ([CartoDB/cartodb-management#5215](https://github.com/CartoDB/cartodb-management/issues/5215))
- Adds organization appearance to forget link URL ([CartoDB/cartodb#14875](https://github.com/CartoDB/cartodb/issues/14875))
- Add public_map_quota to user ([CartoDB/cartodb-central#2452](https://github.com/CartoDB/cartodb-central/issues/2452))
- Fix published maps in Editor ([CartoDB/support#2048](https://github.com/CartoDB/support/issues/2048))
- Add regular_api_key_quota to user ([CartoDB/cartodb-central#2472](https://github.com/CartoDB/cartodb-central/issues/2472))

@ -51,8 +51,10 @@ module LoginHelper
end
end
def forget_password_url
if CartoDB.account_host
def forget_password_url(organization_name: nil)
if organization_name
"#{CartoDB.base_url(organization_name)}/password_resets/new"
elsif CartoDB.account_host
"#{request.protocol}#{CartoDB.account_host}/password_resets/new"
else
CartoDB.url(self, 'new_password_reset')

@ -42,7 +42,7 @@
<% end %>
<div class="Sessions-inputLinkAside">
<%= link_to 'Forgot?', forget_password_url %>
<%= link_to 'Forgot?', forget_password_url(organization_name: @organization.try(:name)) %>
</div>
</div>

Loading…
Cancel
Save