darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-11 18:37:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

blunt rename of org (#620)

Browse Source
This commit is contained in:
Steven Reilly
2023-07-12 12:09:44 -04:00
committed by GitHub
parent 5fe81bc040
commit 13d0e46b52
107 changed files with 1471 additions and 1471 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/main/views/choose_account.py
+9 -9
View File
@@ -3,7 +3,7 @@ from flask_login import current_user
from app import status_api_client
from app.main import main
from app.models.organisation import AllOrganisations
from app.models.organization import AllOrganizations
from app.utils import PermanentRedirect
from app.utils.user import user_is_logged_in
@@ -24,8 +24,8 @@ def choose_account():
org_count, live_service_count = None, None
if current_user.platform_admin:
org_count, live_service_count = (
len(AllOrganisations()),
status_api_client.get_count_of_live_services_and_organisations()['services'],
len(AllOrganizations()),
status_api_client.get_count_of_live_services_and_organizations()['services'],
)
return render_template(
'views/choose-account.html',
@@ -45,14 +45,14 @@ def show_accounts_or_dashboard():
if service_id and (current_user.belongs_to_service(service_id) or current_user.platform_admin):
return redirect(url_for('.service_dashboard', service_id=service_id))
organisation_id = session.get('organisation_id')
if organisation_id and (current_user.belongs_to_organisation(organisation_id) or current_user.platform_admin):
return redirect(url_for('.organisation_dashboard', org_id=organisation_id))
organization_id = session.get('organization_id')
if organization_id and (current_user.belongs_to_organization(organization_id) or current_user.platform_admin):
return redirect(url_for('.organization_dashboard', org_id=organization_id))
if len(current_user.service_ids) == 1 and not current_user.organisation_ids:
if len(current_user.service_ids) == 1 and not current_user.organization_ids:
return redirect(url_for('.service_dashboard', service_id=current_user.service_ids[0]))
if len(current_user.organisation_ids) == 1 and not current_user.trial_mode_services:
return redirect(url_for('.organisation_dashboard', org_id=current_user.organisation_ids[0]))
if len(current_user.organization_ids) == 1 and not current_user.trial_mode_services:
return redirect(url_for('.organization_dashboard', org_id=current_user.organization_ids[0]))
return redirect(url_for('.choose_account'))