paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 22:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

terms: Rename and tweak FIRST_TIME_TERMS_OF_SERVICE_TEMPLATE.

Browse Source 
We do s/TOS/TERMS_OF_SERVICE/ on the name, and while we're at it,
remove the assumed zerver/ namespace for the template, which isn't
correct -- Zulip Cloud related content should be in the corporate/
directory.
This commit is contained in:
Tim Abbott
2021-12-10 11:16:42 -08:00
committed by Tim Abbott
parent 509ed9ebf4
commit 95854d9d94
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
templates/zerver/zulipchat_migration_tos.html → templates/corporate/zulipchat_migration_tos.html
View File

2
zerver/tests/test_home.py
View File

@@ -496,7 +496,7 @@ class HomeTest(ZulipTestCase):
user.tos_version = None user.tos_version = None
user.save() user.save()
with self.settings(FIRST_TIME_TOS_TEMPLATE="hello.html"), self.settings( with self.settings(FIRST_TIME_TERMS_OF_SERVICE_TEMPLATE="zerver/hello.html"), self.settings(
TERMS_OF_SERVICE_VERSION="99.99" TERMS_OF_SERVICE_VERSION="99.99"
): ):
result = self.client_post("/accounts/accept_terms/") result = self.client_post("/accounts/accept_terms/")

7
zerver/views/home.py
View File

@@ -49,8 +49,11 @@ def accounts_accept_terms(request: HttpRequest) -> HttpResponse:
email = request.user.delivery_email email = request.user.delivery_email
special_message_template = None special_message_template = None
if request.user.tos_version is None and settings.FIRST_TIME_TOS_TEMPLATE is not None: if (
special_message_template = "zerver/" + settings.FIRST_TIME_TOS_TEMPLATE request.user.tos_version is None
and settings.FIRST_TIME_TERMS_OF_SERVICE_TEMPLATE is not None
):
special_message_template = settings.FIRST_TIME_TERMS_OF_SERVICE_TEMPLATE
return render( return render(
request, request,
"zerver/accounts_accept_terms.html", "zerver/accounts_accept_terms.html",

2
zproject/default_settings.py
View File

@@ -360,7 +360,7 @@ REALM_CREATION_LINK_VALIDITY_DAYS = 7
# Zulip again on the web. # Zulip again on the web.
TERMS_OF_SERVICE_VERSION: Optional[str] = None TERMS_OF_SERVICE_VERSION: Optional[str] = None
# Template to use when bumping TERMS_OF_SERVICE_VERSION to explain situation. # Template to use when bumping TERMS_OF_SERVICE_VERSION to explain situation.
FIRST_TIME_TOS_TEMPLATE: Optional[str] = None FIRST_TIME_TERMS_OF_SERVICE_TEMPLATE: Optional[str] = None
# Hostname used for Zulip's statsd logging integration. # Hostname used for Zulip's statsd logging integration.
STATSD_HOST = "" STATSD_HOST = ""