mirror of https://github.com/zulip/zulip.git
support: Remove abbreviation for "Organization type".
This commit is contained in:
parent
b52b1bcca8
commit
31c32bcba7
|
@ -199,7 +199,7 @@ class TestRemoteServerSupportEndpoint(ZulipTestCase):
|
||||||
f"<h3>{name}</h3>",
|
f"<h3>{name}</h3>",
|
||||||
f"<b>Remote realm host:</b> {host}<br />",
|
f"<b>Remote realm host:</b> {host}<br />",
|
||||||
"<b>Date created</b>: 01 December 2023",
|
"<b>Date created</b>: 01 December 2023",
|
||||||
"<b>Org type</b>: Unspecified<br />",
|
"<b>Organization type</b>: Unspecified<br />",
|
||||||
"<b>Has remote realms</b>: True<br />",
|
"<b>Has remote realms</b>: True<br />",
|
||||||
"📶 Push notification status:",
|
"📶 Push notification status:",
|
||||||
],
|
],
|
||||||
|
@ -1155,7 +1155,7 @@ class TestSupportEndpoint(ZulipTestCase):
|
||||||
)
|
)
|
||||||
m.assert_called_once_with(get_realm("zulip"), 70, acting_user=iago)
|
m.assert_called_once_with(get_realm("zulip"), 70, acting_user=iago)
|
||||||
self.assert_in_success_response(
|
self.assert_in_success_response(
|
||||||
["Org type of zulip changed from Business to Government"], result
|
["Organization type of zulip changed from Business to Government"], result
|
||||||
)
|
)
|
||||||
|
|
||||||
def test_attach_discount(self) -> None:
|
def test_attach_discount(self) -> None:
|
||||||
|
|
|
@ -417,7 +417,7 @@ def support(
|
||||||
elif org_type is not None:
|
elif org_type is not None:
|
||||||
current_realm_type = realm.org_type
|
current_realm_type = realm.org_type
|
||||||
do_change_realm_org_type(realm, org_type, acting_user=acting_user)
|
do_change_realm_org_type(realm, org_type, acting_user=acting_user)
|
||||||
msg = f"Org type of {realm.string_id} changed from {get_org_type_display_name(current_realm_type)} to {get_org_type_display_name(org_type)} "
|
msg = f"Organization type of {realm.string_id} changed from {get_org_type_display_name(current_realm_type)} to {get_org_type_display_name(org_type)} "
|
||||||
context["success_message"] = msg
|
context["success_message"] = msg
|
||||||
elif new_subdomain is not None:
|
elif new_subdomain is not None:
|
||||||
old_subdomain = realm.string_id
|
old_subdomain = realm.string_id
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
<th>ARR</th>
|
<th>ARR</th>
|
||||||
<th>Rate (%)</th>
|
<th>Rate (%)</th>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<th>Org type</th>
|
<th>Organization type</th>
|
||||||
<th>Referrer</th>
|
<th>Referrer</th>
|
||||||
<th>DAU</th>
|
<th>DAU</th>
|
||||||
<th>WAU</th>
|
<th>WAU</th>
|
||||||
|
|
|
@ -58,7 +58,7 @@
|
||||||
<button type="submit" class="support-submit-button">Update</button>
|
<button type="submit" class="support-submit-button">Update</button>
|
||||||
</form>
|
</form>
|
||||||
<form method="POST" class="support-form">
|
<form method="POST" class="support-form">
|
||||||
<b>Org type</b>:<br />
|
<b>Organization type</b>:<br />
|
||||||
{{ csrf_input }}
|
{{ csrf_input }}
|
||||||
<input type="hidden" name="realm_id" value="{{ realm.id }}" />
|
<input type="hidden" name="realm_id" value="{{ realm.id }}" />
|
||||||
<select name="org_type" id="org_type">
|
<select name="org_type" id="org_type">
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
<b>Date created</b>: {{ support_data[remote_realm.id].date_created.strftime('%d %B %Y') }}<br />
|
<b>Date created</b>: {{ support_data[remote_realm.id].date_created.strftime('%d %B %Y') }}<br />
|
||||||
<b>UUID</b>: {{ remote_realm.uuid }}<br />
|
<b>UUID</b>: {{ remote_realm.uuid }}<br />
|
||||||
<br />
|
<br />
|
||||||
<b>Org type</b>: {{ get_org_type_display_name(remote_realm.org_type) }}<br />
|
<b>Organization type</b>: {{ get_org_type_display_name(remote_realm.org_type) }}<br />
|
||||||
<b>Plan type</b>: {{ get_plan_type_name(remote_realm.plan_type) }}<br />
|
<b>Plan type</b>: {{ get_plan_type_name(remote_realm.plan_type) }}<br />
|
||||||
<b>Non-guest user count</b>: {{ support_data[remote_realm.id].user_data.non_guest_user_count }}<br />
|
<b>Non-guest user count</b>: {{ support_data[remote_realm.id].user_data.non_guest_user_count }}<br />
|
||||||
<b>Guest user count</b>: {{ support_data[remote_realm.id].user_data.guest_user_count }}<br />
|
<b>Guest user count</b>: {{ support_data[remote_realm.id].user_data.guest_user_count }}<br />
|
||||||
|
|
Loading…
Reference in New Issue