Skip to content

organisations views: simple type fixes #6104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
risicle merged 1 commit into from
Sep 21, 2026
Merged

organisations views: simple type fixes #6104

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions app/main/views/organisations/index.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def add_organisation():
except HTTPError as e:
org_name_exists_message = "Organisation name already exists"
if e.status_code == 400 and org_name_exists_message in e.message:
form.name.errors.append("This organisation name is already in use.")
form.name.errors.append("This organisation name is already in use.") # type: ignore[attr-defined] # is there a better way?
else:
raise e

Expand Down Expand Up @@ -306,7 +306,7 @@ def edit_organisation_name(org_id):
except HTTPError as http_error:
error_msg = "Organisation name already exists"
if http_error.status_code == 400 and error_msg in http_error.message:
form.name.errors.append("This organisation name is already in use")
form.name.errors.append("This organisation name is already in use") # type: ignore[attr-defined] # is there a better way?
else:
raise http_error
else:
Expand Down Expand Up @@ -541,7 +541,11 @@ def archive_organisation(org_id):
try:
organisations_client.archive_organisation(org_id)
except HTTPError as e:
if e.status_code == 400 and ("team members" in e.message or "services" in e.message):
if (
e.status_code == 400
and isinstance(e.message, str)
and ("team members" in e.message or "services" in e.message)
):
flash(e.message)
return organisation_settings(org_id)
else:
Expand Down
Loading