diff --git a/.gitignore b/.gitignore index df0438dd..c41b088f 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ db/structure.sql # Ignore IDE config files .idea/ +.DS_Store diff --git a/Gemfile b/Gemfile index 46a10fda..7e2ad10a 100644 --- a/Gemfile +++ b/Gemfile @@ -20,6 +20,8 @@ gem "jbuilder" # Use Active Model has_secure_password [https://guides.rubyonrails.org/active_model_basics.html#securepassword] gem "bcrypt", "~> 3.1.7" +gem "csv" + # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem "tzinfo-data", platforms: %i[ windows jruby ] diff --git a/Gemfile.lock b/Gemfile.lock index 8a86d85b..a48feb36 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -105,6 +105,7 @@ GEM concurrent-ruby (1.3.5) connection_pool (2.5.0) crass (1.0.6) + csv (3.3.2) date (3.4.1) debug (1.10.0) irb (~> 1.10) @@ -436,6 +437,7 @@ DEPENDENCIES brakeman bullet capybara + csv debug factory_bot_rails faker diff --git a/app/models/language.rb b/app/models/language.rb index ecef7626..571995e6 100644 --- a/app/models/language.rb +++ b/app/models/language.rb @@ -1,4 +1,5 @@ class Language < ApplicationRecord + has_many :topics, dependent: :destroy validates :name, presence: true, uniqueness: true, length: { minimum: 2 } def file_storage_prefix diff --git a/app/models/region.rb b/app/models/region.rb index 6a6e6fda..5c93e3b2 100644 --- a/app/models/region.rb +++ b/app/models/region.rb @@ -1,5 +1,5 @@ class Region < ApplicationRecord - has_many :branches + has_many :branches, dependent: :destroy has_many :providers, through: :branches validates :name, presence: true diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index ca755215..045af64a 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -26,8 +26,6 @@ - -