mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-07-22 02:36:02 +02:00
Merge branch 'za/1909-change-org-field-to-new-format' into za/1911-fill-new-org-type-column
This commit is contained in:
commit
fb35ab17af
1 changed files with 18 additions and 1 deletions
|
@ -105,7 +105,16 @@ def _update_org_type_from_generic_org_and_election(instance, org_map):
|
||||||
if generic_org_type not in org_map:
|
if generic_org_type not in org_map:
|
||||||
# Election board should always be reset to None if the record
|
# Election board should always be reset to None if the record
|
||||||
# can't have one. For example, federal.
|
# can't have one. For example, federal.
|
||||||
instance.is_election_board = None
|
if instance.is_election_board is not None:
|
||||||
|
# This maintains data consistency.
|
||||||
|
# There is no avenue for this to occur in the UI,
|
||||||
|
# as such - this can only occur if the object is initialized in this way.
|
||||||
|
# Or if there are pre-existing data.
|
||||||
|
logger.warning(
|
||||||
|
"create_or_update_organization_type() -> is_election_board "
|
||||||
|
f"cannot exist for {generic_org_type}. Setting to None."
|
||||||
|
)
|
||||||
|
instance.is_election_board = None
|
||||||
instance.organization_type = generic_org_type
|
instance.organization_type = generic_org_type
|
||||||
else:
|
else:
|
||||||
# This can only happen with manual data tinkering, which causes these to be out of sync.
|
# This can only happen with manual data tinkering, which causes these to be out of sync.
|
||||||
|
@ -139,6 +148,14 @@ def _update_generic_org_and_election_from_org_type(instance, election_org_map, g
|
||||||
if current_org_type in generic_org_map:
|
if current_org_type in generic_org_map:
|
||||||
instance.is_election_board = False
|
instance.is_election_board = False
|
||||||
else:
|
else:
|
||||||
|
# This maintains data consistency.
|
||||||
|
# There is no avenue for this to occur in the UI,
|
||||||
|
# as such - this can only occur if the object is initialized in this way.
|
||||||
|
# Or if there are pre-existing data.
|
||||||
|
logger.warning(
|
||||||
|
"create_or_update_organization_type() -> is_election_board "
|
||||||
|
f"cannot exist for {current_org_type}. Setting to None."
|
||||||
|
)
|
||||||
instance.is_election_board = None
|
instance.is_election_board = None
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue