diff --git a/confirmation/models.py b/confirmation/models.py index 42f67daabc..6740b30cb5 100644 --- a/confirmation/models.py +++ b/confirmation/models.py @@ -201,7 +201,7 @@ def confirmation_url( url_args = dict(url_args) url_args["confirmation_key"] = confirmation_key return urljoin( - settings.ROOT_DOMAIN_URI if realm is None else realm.uri, + settings.ROOT_DOMAIN_URI if realm is None else realm.url, reverse(_properties[confirmation_type].url_name, kwargs=url_args), ) diff --git a/corporate/lib/stripe.py b/corporate/lib/stripe.py index 62cae5239d..c6590f9320 100644 --- a/corporate/lib/stripe.py +++ b/corporate/lib/stripe.py @@ -389,7 +389,7 @@ def payment_method_string(stripe_customer: stripe.Customer) -> str: def build_support_url(support_view: str, query_text: str) -> str: - support_realm_url = get_realm(settings.STAFF_SUBDOMAIN).uri + support_realm_url = get_realm(settings.STAFF_SUBDOMAIN).url support_url = urljoin(support_realm_url, reverse(support_view)) query = urlencode({"q": query_text}) support_url = append_url_query_string(support_url, query) @@ -3756,7 +3756,7 @@ class RealmBillingSession(BillingSession): @override @property def billing_session_url(self) -> str: - return self.realm.uri + return self.realm.url @override @property @@ -5310,7 +5310,7 @@ def downgrade_small_realms_behind_on_payments_as_needed() -> None: billing_session.downgrade_now_without_creating_additional_invoices() billing_session.void_all_open_invoices() context: Dict[str, Union[str, Realm]] = { - "upgrade_url": f"{realm.uri}{reverse('upgrade_page')}", + "upgrade_url": f"{realm.url}{reverse('upgrade_page')}", "realm": realm, } send_email_to_billing_admins_and_realm_owners( diff --git a/corporate/lib/support.py b/corporate/lib/support.py index 731188fa1c..2f08f552ad 100644 --- a/corporate/lib/support.py +++ b/corporate/lib/support.py @@ -112,9 +112,9 @@ class CloudSupportData: def get_realm_support_url(realm: Realm) -> str: - support_realm_uri = get_realm(settings.STAFF_SUBDOMAIN).uri + support_realm_url = get_realm(settings.STAFF_SUBDOMAIN).url support_url = urljoin( - support_realm_uri, + support_realm_url, urlunsplit(("", "", reverse("support"), urlencode({"q": realm.string_id}), "")), ) return support_url diff --git a/corporate/views/portico.py b/corporate/views/portico.py index 96ad79760f..9cbddcae12 100644 --- a/corporate/views/portico.py +++ b/corporate/views/portico.py @@ -336,7 +336,7 @@ def communities_view(request: HttpRequest) -> HttpResponse: { "id": realm.id, "name": realm.name, - "realm_url": realm.uri, + "realm_url": realm.url, "logo_url": get_realm_icon_url(realm), "description": get_realm_text_description(realm), "org_type_key": org_type, diff --git a/templates/corporate/support/realm_details.html b/templates/corporate/support/realm_details.html index a277971fe1..56b92d0f9a 100644 --- a/templates/corporate/support/realm_details.html +++ b/templates/corporate/support/realm_details.html @@ -1,7 +1,7 @@
Cloud realm

{{ realm.name }}

- URL: {{ realm.uri }} | + URL: {{ realm.url }} | stats | activity
Date created: {{ realm.date_created|timesince }} ago
diff --git a/templates/zerver/development/dev_login.html b/templates/zerver/development/dev_login.html index fc762273f5..395a7f0aa3 100644 --- a/templates/zerver/development/dev_login.html +++ b/templates/zerver/development/dev_login.html @@ -25,7 +25,7 @@ page can be easily identified in it's respective JavaScript file --> {% if realm_web_public_access_enabled %}

{{_('Anonymous user') }}

-

{% endif %} @@ -33,7 +33,7 @@ page can be easily identified in it's respective JavaScript file --> {% if direct_owners %} {% for direct_owner in direct_owners %}

-