Skip to content

Commit

Permalink
Merge pull request #1876 from alphagov/Rename-Micronesia
Browse files Browse the repository at this point in the history
Rename Micronesia
  • Loading branch information
GDSNewt authored Apr 17, 2024
2 parents 6976828 + 87dd1bc commit 1a4c0e6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions app/models/travel_advice_edition.rb
Original file line number Diff line number Diff line change
Expand Up @@ -222,13 +222,13 @@ def populate_version_number
end

def cannot_edit_published
if anything_other_than_state_changed?("reviewed_at", "update_type") && state_was != "draft" && state_was != "scheduled"
if anything_other_than_state_changed?("reviewed_at", "update_type", "country_slug") && state_was != "draft" && state_was != "scheduled"
errors.add(:state, "must be draft to modify")
end
end

def cannot_edit_archived
if anything_other_than_state_changed?("update_type")
if anything_other_than_state_changed?("update_type", "country_slug")
errors.add(:state, "must be draft to modify")
end
end
Expand Down
8 changes: 4 additions & 4 deletions lib/data/countries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,10 @@
slug: falkland-islands
content_id: 61a1542f-d196-42a0-9605-ad667b60504e
email_signup_content_id: 14d80b15-93f6-49aa-aa44-9dd2ae3626eb
- name: Federated States of Micronesia
slug: federated-states-of-micronesia
content_id: d010fd00-bf63-42f0-ba7b-0982f49cb3d4
email_signup_content_id: d79f8657-c943-4952-b87d-d968917d4079
- name: Fiji
slug: fiji
content_id: 4b79ee8f-0217-486b-bcc9-5f0ef9c16b54
Expand Down Expand Up @@ -527,10 +531,6 @@
slug: mexico
content_id: 34dafa2b-24e5-4625-b542-bf5e0bb8cd80
email_signup_content_id: 5e97d048-633a-4ed5-9244-c94f267d592e
- name: Micronesia
slug: micronesia
content_id: d010fd00-bf63-42f0-ba7b-0982f49cb3d4
email_signup_content_id: d79f8657-c943-4952-b87d-d968917d4079
- name: Moldova
slug: moldova
content_id: 4064154c-ef7e-4edf-9f98-8f747ce39471
Expand Down

0 comments on commit 1a4c0e6

Please sign in to comment.