mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-14 03:05:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into charts-with-specs

Browse Source
This commit is contained in:
Shiny
2018-01-13 22:58:57 +13:00
committed by GitHub
parent 3a4443a4fe 09771d323a
commit 6efdcb74d3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/csv_importer.rb
View File

@@ -46,7 +46,7 @@ class CsvImporter
names_to_add.each do |name|
sciname = ScientificName.find_by(name: name, crop: @crop)
sciname = ScientificName.create!(name: name, crop: @crop, creator: cropbot) unless sciname
sciname ||= ScientificName.create!(name: name, crop: @crop, creator: cropbot)
@crop.scientific_names << sciname
end
end
@@ -56,13 +56,13 @@ class CsvImporter
return if alternate_names.blank?
alternate_names.split(/,\s*/).each do |name|
altname = AlternateName.find_by(name: name, crop: @crop)
altname = AlternateName.create! name: name, crop: @crop, creator: cropbot unless altname
altname ||= AlternateName.create! name: name, crop: @crop, creator: cropbot
@crop.alternate_names << altname
end
end
def cropbot
@cropbot = Member.find_by!(login_name: 'cropbot') unless @cropbot
@cropbot ||= Member.find_by!(login_name: 'cropbot')
@cropbot
rescue StandardError
raise "cropbot account not found: run rake db:seed"