From 656b0e44d8dbceb01a10c2b59ef6f07f724f111d Mon Sep 17 00:00:00 2001 From: Shiho Takagi Date: Mon, 2 Feb 2015 18:40:24 +1100 Subject: [PATCH] fixing issue with elasticsearch option false in dev --- app/models/alternate_name.rb | 2 +- app/models/crop.rb | 2 +- app/models/scientific_name.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/alternate_name.rb b/app/models/alternate_name.rb index cb6f79e9d..857adf7ec 100644 --- a/app/models/alternate_name.rb +++ b/app/models/alternate_name.rb @@ -1,5 +1,5 @@ class AlternateName < ActiveRecord::Base - after_commit { |an| an.crop.__elasticsearch__.index_document if an.crop } + after_commit { |an| an.crop.__elasticsearch__.index_document if an.crop && ENV['GROWSTUFF_ELASTICSEARCH'] == "true" } belongs_to :crop belongs_to :creator, :class_name => 'Member' end diff --git a/app/models/crop.rb b/app/models/crop.rb index 82d1e24a0..831c8ccb4 100644 --- a/app/models/crop.rb +++ b/app/models/crop.rb @@ -85,7 +85,7 @@ class Crop < ActiveRecord::Base end def update_index(name_obj) - __elasticsearch__.index_document + __elasticsearch__.index_document if ENV['GROWSTUFF_ELASTICSEARCH'] == "true" end #################################### diff --git a/app/models/scientific_name.rb b/app/models/scientific_name.rb index 7469b3946..aec8f1091 100644 --- a/app/models/scientific_name.rb +++ b/app/models/scientific_name.rb @@ -1,5 +1,5 @@ class ScientificName < ActiveRecord::Base - after_commit { |sn| sn.crop.__elasticsearch__.index_document if sn.crop } + after_commit { |sn| sn.crop.__elasticsearch__.index_document if sn.crop && ENV['GROWSTUFF_ELASTICSEARCH'] == "true" } belongs_to :crop belongs_to :creator, :class_name => 'Member' end