From ce573c1e55f4713b209e87f77e90dfb1a4afce9f Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Fri, 10 Feb 2017 22:41:28 +1300 Subject: [PATCH 1/3] Simplified logic in planting.planting_slug --- app/models/planting.rb | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/app/models/planting.rb b/app/models/planting.rb index 112f53ba3..c11f1335f 100644 --- a/app/models/planting.rb +++ b/app/models/planting.rb @@ -64,15 +64,11 @@ class Planting < ActiveRecord::Base end def planting_slug - if garden.present? && crop.present? - "#{owner.login_name}-#{garden.name}-#{crop.name}" - elsif garden.present? - "#{owner.login_name}-#{garden.name}-null" - elsif crop.present? - "#{owner.login_name}-null-#{crop.name}" - else - "#{owner.login_name}-null-null" - end.downcase.gsub(' ', '-') + [ + owner.login_name, + garden.present? ? garden.name : 'null', + crop.present? ? crop.name : 'null' + ].downcase.tr(' ', '-') end # location = garden owner + garden name, i.e. "Skud's backyard" From a0bf8156637ac5612908861497cc4057faeb4fcb Mon Sep 17 00:00:00 2001 From: Shiny Date: Fri, 10 Feb 2017 23:52:10 +1300 Subject: [PATCH 2/3] Downcase planting slug --- app/models/planting.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/planting.rb b/app/models/planting.rb index c11f1335f..0b5d8a474 100644 --- a/app/models/planting.rb +++ b/app/models/planting.rb @@ -68,7 +68,7 @@ class Planting < ActiveRecord::Base owner.login_name, garden.present? ? garden.name : 'null', crop.present? ? crop.name : 'null' - ].downcase.tr(' ', '-') + ].tr(' ', '-').downcase end # location = garden owner + garden name, i.e. "Skud's backyard" From cc1daf8f6b5d72332ed32b460e357a95e0d4323e Mon Sep 17 00:00:00 2001 From: Shiny Date: Fri, 10 Feb 2017 23:54:16 +1300 Subject: [PATCH 3/3] Join slug with - --- app/models/planting.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/planting.rb b/app/models/planting.rb index 0b5d8a474..34103a273 100644 --- a/app/models/planting.rb +++ b/app/models/planting.rb @@ -68,7 +68,7 @@ class Planting < ActiveRecord::Base owner.login_name, garden.present? ? garden.name : 'null', crop.present? ? crop.name : 'null' - ].tr(' ', '-').downcase + ].join('-').tr(' ', '-').downcase end # location = garden owner + garden name, i.e. "Skud's backyard"