Skip to content

Commit

Permalink
Merge branch 'fix/seed-data' into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
tvcam committed Aug 25, 2023
2 parents d8e9d9d + 89f0904 commit a9def4b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 17 deletions.
8 changes: 0 additions & 8 deletions app/helpers/screening_assessment_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,4 @@ def date_of_birth_in_words(date_of_birth, locale = :en)
"No Date of Birth"
end
end

def by_age_translation(developmental_marker_name)
developmental_marker_name = '1 year' if developmental_marker_name.match(/12 months/)
developmental_marker_name = '1.5 years' if developmental_marker_name.match(/18 months/)
developmental_marker_name = developmental_marker_name.downcase.gsub(" ", "_").gsub(".", "_")

t("inline_help.cb_dmat.by_age_#{developmental_marker_name}").html_safe
end
end
15 changes: 6 additions & 9 deletions app/models/organization.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,12 @@ def switch_to(tenant_name)
end

def create_and_build_tenant(fields = {})
transaction do
org = new(fields)
if org.save

Apartment::Tenant.create(org.short_name)
org
else
false
end
org = new(fields)
if org.save
Apartment::Tenant.create(org.short_name)
org
else
false
end
end

Expand Down

0 comments on commit a9def4b

Please sign in to comment.