diff --git a/.gitignore b/.gitignore index ead788319..5b8787714 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ *~ *.DS_Store credentials.sh +Pathogen: \ No newline at end of file diff --git a/Pathogen: b/Pathogen: deleted file mode 100644 index a5b3293af..000000000 --- a/Pathogen: +++ /dev/null @@ -1 +0,0 @@ -clean up extra line in garden_spec. diff --git a/app/models/garden.rb b/app/models/garden.rb index a2bd553e7..13d8927c6 100644 --- a/app/models/garden.rb +++ b/app/models/garden.rb @@ -36,12 +36,6 @@ class Garden < ActiveRecord::Base return unique_plantings[0..3] end - def replace_blank_name - if self.name.nil? or self.name =~ /^\s*$/ - self.name = "(no name)" - end - end - def to_s name end diff --git a/lib/tasks/growstuff.rake b/lib/tasks/growstuff.rake index 15cdb61a6..fb87ea319 100644 --- a/lib/tasks/growstuff.rake +++ b/lib/tasks/growstuff.rake @@ -26,15 +26,17 @@ namespace :growstuff do end end - task :empty_names => :environment do - desc "May 2013: replace any empty garden names with (no subject)" + task :empty_garden_names => :environment do + desc "May 2013: replace any empty garden names with Garden" # this is inefficient as it checks every Garden, but the # site is small and there aren't many of them, so it shouldn't matter # for this one-off script. - Garden.all.each do |n| - n.replace_blank_name - n.save + Garden.all.each do |g| + if g.name.nil? or g.name =~ /^\s*$/ + g.name = "Garden" + g.save + end end end