archive/bramw_baserow
1
0
Fork 0
mirror of https://gitlab.com/bramw/baserow.git synced 2025-04-04 13:15:24 +00:00
Code Issues Projects Releases Wiki Activity

Hide Baserow description in all emails if white label is enabled

Browse source
This commit is contained in:
Bram Wiepjes 2025-03-06 22:25:08 +01:00
parent fcef337c9d
commit 67f63e0156
17 changed files with 94 additions and 43 deletions

1
backend/src/baserow/core/emails_context_types.py
View file

@ -20,4 +20,5 @@ class CoreEmailContextType(EmailContextType):
"baserow_embedded_share_hostname": settings.BASEROW_EMBEDDED_SHARE_HOSTNAME,
"logo_url": settings.PUBLIC_WEB_FRONTEND_URL + "/img/logo.svg",
"logo_additional_text": "",
"show_baserow_description": True,
}

4
backend/src/baserow/core/templates/baserow/core/notifications_summary.html
View file

@ -230,11 +230,15 @@
</tr>
<!-- htmlmin:ignore -->{% endif %}
<!-- htmlmin:ignore -->
<!-- htmlmin:ignore -->{% if show_baserow_description %}
<!-- htmlmin:ignore -->
<tr>
<td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
<div style="font-family:Inter,sans-serif;font-size:13px;line-height:170%;text-align:left;color:#070810;">{% blocktrans trimmed %} Baserow is an open source no-code database tool which allows you to collaborate on projects, customers and more. It gives you the powers of a developer without leaving your browser. {% endblocktrans %}</div>
</td>
</tr>
<!-- htmlmin:ignore -->{% endif %}
<!-- htmlmin:ignore -->
</tbody>
</table>
</div>

16
backend/src/baserow/core/templates/baserow/core/notifications_summary.mjml.eta
View file

@ -31,12 +31,14 @@
{% endblocktrans %}
</mj-text>
<mj-raw><!-- htmlmin:ignore -->{% endif %}<!-- htmlmin:ignore --></mj-raw>
<mj-text mj-class="text">
{% blocktrans trimmed %}
Baserow is an open source no-code database tool which allows you to collaborate
on projects, customers and more. It gives you the powers of a developer without
leaving your browser.
{% endblocktrans %}
</mj-text>
<mj-raw><!-- htmlmin:ignore -->{% if show_baserow_description %}<!-- htmlmin:ignore --></mj-raw>
<mj-text mj-class="text">
{% blocktrans trimmed %}
Baserow is an open source no-code database tool which allows you to collaborate
on projects, customers and more. It gives you the powers of a developer without
leaving your browser.
{% endblocktrans %}
</mj-text>
<mj-raw><!-- htmlmin:ignore -->{% endif %}<!-- htmlmin:ignore --></mj-raw>
</mj-column>
</mj-section>

4
backend/src/baserow/core/templates/baserow/core/user/account_deleted.html
View file

@ -181,11 +181,15 @@
<div style="font-family:Inter,sans-serif;font-size:13px;line-height:170%;text-align:left;color:#070810;">{% blocktrans trimmed with baserow_embedded_share_hostname as baserow_embedded_share_hostname %} Your account ({{ username }}) on Baserow ({{ baserow_embedded_share_hostname }}) has been permanently deleted. {% endblocktrans %}</div>
</td>
</tr>
<!-- htmlmin:ignore -->{% if show_baserow_description %}
<!-- htmlmin:ignore -->
<tr>
<td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
<div style="font-family:Inter,sans-serif;font-size:13px;line-height:170%;text-align:left;color:#070810;">{% blocktrans trimmed %} Baserow is an open source no-code database tool which allows you to collaborate on projects, customers and more. It gives you the powers of a developer without leaving your browser. {% endblocktrans %}</div>
</td>
</tr>
<!-- htmlmin:ignore -->{% endif %}
<!-- htmlmin:ignore -->
</tbody>
</table>
</div>

16
backend/src/baserow/core/templates/baserow/core/user/account_deleted.mjml.eta
View file

@ -10,12 +10,14 @@
deleted.
{% endblocktrans %}
</mj-text>
<mj-text mj-class="text">
{% blocktrans trimmed %}
Baserow is an open source no-code database tool which allows you to collaborate
on projects, customers and more. It gives you the powers of a developer without
leaving your browser.
{% endblocktrans %}
</mj-text>
<mj-raw><!-- htmlmin:ignore -->{% if show_baserow_description %}<!-- htmlmin:ignore --></mj-raw>
<mj-text mj-class="text">
{% blocktrans trimmed %}
Baserow is an open source no-code database tool which allows you to collaborate
on projects, customers and more. It gives you the powers of a developer without
leaving your browser.
{% endblocktrans %}
</mj-text>
<mj-raw><!-- htmlmin:ignore -->{% endif %}<!-- htmlmin:ignore --></mj-raw>
</mj-column>
</mj-section>

4
backend/src/baserow/core/templates/baserow/core/user/account_deletion_cancelled.html
View file

@ -181,11 +181,15 @@
<div style="font-family:Inter,sans-serif;font-size:13px;line-height:170%;text-align:left;color:#070810;">{% blocktrans trimmed with user.username as username and baserow_embedded_share_hostname as baserow_embedded_share_hostname %} Your account ({{ username }}) on Baserow ({{ baserow_embedded_share_hostname }}) was pending deletion, but you've logged in so this operation has been cancelled. {% endblocktrans %}</div>
</td>
</tr>
<!-- htmlmin:ignore -->{% if show_baserow_description %}
<!-- htmlmin:ignore -->
<tr>
<td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
<div style="font-family:Inter,sans-serif;font-size:13px;line-height:170%;text-align:left;color:#070810;">{% blocktrans trimmed %} Baserow is an open source no-code database tool which allows you to collaborate on projects, customers and more. It gives you the powers of a developer without leaving your browser. {% endblocktrans %}</div>
</td>
</tr>
<!-- htmlmin:ignore -->{% endif %}
<!-- htmlmin:ignore -->
</tbody>
</table>
</div>

16
backend/src/baserow/core/templates/baserow/core/user/account_deletion_cancelled.mjml.eta
View file

@ -10,12 +10,14 @@
logged in so this operation has been cancelled.
{% endblocktrans %}
</mj-text>
<mj-text mj-class="text">
{% blocktrans trimmed %}
Baserow is an open source no-code database tool which allows you to collaborate
on projects, customers and more. It gives you the powers of a developer without
leaving your browser.
{% endblocktrans %}
</mj-text>
<mj-raw><!-- htmlmin:ignore -->{% if show_baserow_description %}<!-- htmlmin:ignore --></mj-raw>
<mj-text mj-class="text">
{% blocktrans trimmed %}
Baserow is an open source no-code database tool which allows you to collaborate
on projects, customers and more. It gives you the powers of a developer without
leaving your browser.
{% endblocktrans %}
</mj-text>
<mj-raw><!-- htmlmin:ignore -->{% endif %}<!-- htmlmin:ignore --></mj-raw>
</mj-column>
</mj-section>

4
backend/src/baserow/core/templates/baserow/core/user/account_deletion_scheduled.html
View file

@ -186,11 +186,15 @@
<div style="font-family:Inter,sans-serif;font-size:13px;line-height:170%;text-align:left;color:#070810;">{% blocktrans trimmed %} If you've changed your mind and want to cancel your account deletion, you just have to login again. {% endblocktrans %}</div>
</td>
</tr>
<!-- htmlmin:ignore -->{% if show_baserow_description %}
<!-- htmlmin:ignore -->
<tr>
<td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
<div style="font-family:Inter,sans-serif;font-size:13px;line-height:170%;text-align:left;color:#070810;">{% blocktrans trimmed %} Baserow is an open source no-code database tool which allows you to collaborate on projects, customers and more. It gives you the powers of a developer without leaving your browser. {% endblocktrans %}</div>
</td>
</tr>
<!-- htmlmin:ignore -->{% endif %}
<!-- htmlmin:ignore -->
</tbody>
</table>
</div>

16
backend/src/baserow/core/templates/baserow/core/user/account_deletion_scheduled.mjml.eta
View file

@ -16,12 +16,14 @@
you just have to login again.
{% endblocktrans %}
</mj-text>
<mj-text mj-class="text">
{% blocktrans trimmed %}
Baserow is an open source no-code database tool which allows you to collaborate
on projects, customers and more. It gives you the powers of a developer without
leaving your browser.
{% endblocktrans %}
</mj-text>
<mj-raw><!-- htmlmin:ignore -->{% if show_baserow_description %}<!-- htmlmin:ignore --></mj-raw>
<mj-text mj-class="text">
{% blocktrans trimmed %}
Baserow is an open source no-code database tool which allows you to collaborate
on projects, customers and more. It gives you the powers of a developer without
leaving your browser.
{% endblocktrans %}
</mj-text>
<mj-raw><!-- htmlmin:ignore -->{% endif %}<!-- htmlmin:ignore --></mj-raw>
</mj-column>
</mj-section>

4
backend/src/baserow/core/templates/baserow/core/user/reset_password.html
View file

@ -204,11 +204,15 @@
<div style="font-family:Inter,sans-serif;font-size:12px;line-height:1;text-align:left;color:#9c9c9f;">{{ reset_url }}</div>
</td>
</tr>
<!-- htmlmin:ignore -->{% if show_baserow_description %}
<!-- htmlmin:ignore -->
<tr>
<td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
<div style="font-family:Inter,sans-serif;font-size:13px;line-height:170%;text-align:left;color:#070810;">{% blocktrans trimmed %} Baserow is an open source no-code database tool which allows you to collaborate on projects, customers and more. It gives you the powers of a developer without leaving your browser. {% endblocktrans %}</div>
</td>
</tr>
<!-- htmlmin:ignore -->{% endif %}
<!-- htmlmin:ignore -->
</tbody>
</table>
</div>

16
backend/src/baserow/core/templates/baserow/core/user/reset_password.mjml.eta
View file

@ -23,12 +23,14 @@
<mj-text mj-class="button-url">
{{ reset_url }}
</mj-text>
<mj-text mj-class="text">
{% blocktrans trimmed %}
Baserow is an open source no-code database tool which allows you to collaborate
on projects, customers and more. It gives you the powers of a developer without
leaving your browser.
{% endblocktrans %}
</mj-text>
<mj-raw><!-- htmlmin:ignore -->{% if show_baserow_description %}<!-- htmlmin:ignore --></mj-raw>
<mj-text mj-class="text">
{% blocktrans trimmed %}
Baserow is an open source no-code database tool which allows you to collaborate
on projects, customers and more. It gives you the powers of a developer without
leaving your browser.
{% endblocktrans %}
</mj-text>
<mj-raw><!-- htmlmin:ignore -->{% endif %}<!-- htmlmin:ignore --></mj-raw>
</mj-column>
</mj-section>

4
backend/src/baserow/core/templates/baserow/core/workspace_invitation.html
View file

@ -208,11 +208,15 @@
<div style="font-family:Inter,sans-serif;font-size:12px;line-height:1;text-align:left;color:#9c9c9f;">{{ public_accept_url }}</div>
</td>
</tr>
<!-- htmlmin:ignore -->{% if show_baserow_description %}
<!-- htmlmin:ignore -->
<tr>
<td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
<div style="font-family:Inter,sans-serif;font-size:13px;line-height:170%;text-align:left;color:#070810;">{% blocktrans trimmed %} Baserow is an open source no-code database tool which allows you to collaborate on projects, customers and more. It gives you the powers of a developer without leaving your browser. {% endblocktrans %}</div>
</td>
</tr>
<!-- htmlmin:ignore -->{% endif %}
<!-- htmlmin:ignore -->
</tbody>
</table>
</div>

16
backend/src/baserow/core/templates/baserow/core/workspace_invitation.mjml.eta
View file

@ -20,12 +20,14 @@
<mj-text mj-class="button-url">
{{ public_accept_url }}
</mj-text>
<mj-text mj-class="text">
{% blocktrans trimmed %}
Baserow is an open source no-code database tool which allows you to collaborate
on projects, customers and more. It gives you the powers of a developer without
leaving your browser.
{% endblocktrans %}
</mj-text>
<mj-raw><!-- htmlmin:ignore -->{% if show_baserow_description %}<!-- htmlmin:ignore --></mj-raw>
<mj-text mj-class="text">
{% blocktrans trimmed %}
Baserow is an open source no-code database tool which allows you to collaborate
on projects, customers and more. It gives you the powers of a developer without
leaving your browser.
{% endblocktrans %}
</mj-text>
<mj-raw><!-- htmlmin:ignore -->{% endif %}<!-- htmlmin:ignore --></mj-raw>
</mj-column>
</mj-section>

5
backend/src/baserow/core/user/actions.py
View file

@ -291,6 +291,11 @@ class SignInUserActionType(ActionType):
auth_provider
).type
# This check must always be performed, even if the `log_signin_action` call is
# rate limited.
if user.profile.to_be_deleted:
UserHandler().cancel_user_deletion(user)
def log_signin_action():
handler.user_signed_in_via_provider(user, auth_provider)
cls.register_action(

8
changelog/entries/unreleased/feature/3066_hide_baserow_description_in_emails_if_logo_is_changed.json Normal file
View file

@ -0,0 +1,8 @@
{
"type": "feature",
"message": "Hide Baserow description in all emails if logo is changed.",
"domain": "core",
"issue_number": 3066,
"bullet_points": [],
"created_at": "2025-03-06"
}

1
enterprise/backend/src/baserow_enterprise/emails_context_types.py
View file

@ -27,5 +27,6 @@ class EnterpriseEmailContextType(EmailContextType):
):
email_context["logo_url"] = UserFileSerializer(custom_logo).data["url"]
email_context["logo_additional_text"] = "by Baserow"
email_context["show_baserow_description"] = False
return email_context

2
enterprise/web-frontend/modules/baserow_enterprise/locales/en.json
View file

@ -340,7 +340,7 @@
"showBaserowHelpMessageDescription": "Indicates whether the help request message should be shown on the dashboard.",
"deactivated": "Available in enterprise",
"coBrandingLogo": "Logo",
"coBrandingLogoDescription": "Replaces the Baserow logo for a custom co-branded alternative (176x29).",
"coBrandingLogoDescription": "Replaces the Baserow logo for a custom co-branded alternative (176x29). If set, it also removes the Baserow description in the footer of all emails.",
"uploadFileButton": "Upload image"
},
"enterpriseModal": {