From f4c613ade1fc93c703591f93a0d568f8c23dc105 Mon Sep 17 00:00:00 2001 From: Tudor Amariei Date: Tue, 9 Jul 2024 15:04:01 +0300 Subject: [PATCH] Remove the NGOHUB_ORG_OVERWRITE variable --- .env.example | 1 - backend/civil_society_vote/settings.py | 4 +--- backend/hub/models.py | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.env.example b/.env.example index be5a64c6..c4ee8852 100644 --- a/.env.example +++ b/.env.example @@ -37,4 +37,3 @@ AWS_COGNITO_USER_POOL_ID=eu-west-abcdef_0123456789 NGOHUB_API_HOST=api-staging.ngohub.ro NGOHUB_API_ACCOUNT= NGOHUB_API_KEY= -NGOHUB_ORG_OVERWRITE=False diff --git a/backend/civil_society_vote/settings.py b/backend/civil_society_vote/settings.py index e8ef34c9..233efe5a 100644 --- a/backend/civil_society_vote/settings.py +++ b/backend/civil_society_vote/settings.py @@ -92,7 +92,6 @@ RECAPTCHA_PRIVATE_KEY=(str, ""), # TODO Settings Cleanup: ANALYTICS_ENABLED=(bool, False), - NGOHUB_ORG_OVERWRITE=(bool, False), ORGANIZATION_UPDATE_THRESHOLD=(int, 10), ENABLE_ORG_REGISTRATION_FORM=(bool, False), CURRENT_EDITION_YEAR=(int, 2024), @@ -579,8 +578,7 @@ def show_toolbar(request): AWS_COGNITO_CLIENT_ID = env("AWS_COGNITO_CLIENT_ID") AWS_COGNITO_CLIENT_SECRET = env("AWS_COGNITO_CLIENT_SECRET") -# Allow Organization data to overwrite from VotONG forms (should be False) -NGOHUB_ORG_OVERWRITE = env("NGOHUB_ORG_OVERWRITE") +# How often to check for updated organizations ORGANIZATION_UPDATE_THRESHOLD = env.int("ORGANIZATION_UPDATE_THRESHOLD", 10) # Enable the organization registration form in order to sidestep NGO Hub (should be False) diff --git a/backend/hub/models.py b/backend/hub/models.py index f6d2942e..ad5e553a 100644 --- a/backend/hub/models.py +++ b/backend/hub/models.py @@ -361,7 +361,7 @@ def is_fully_editable(self): """ Organizations managed elsewhere (ie: on NGO Hub) should not be fully editable here """ - if self.ngohub_org_id and not settings.NGOHUB_ORG_OVERWRITE: + if self.ngohub_org_id: return False return True