mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-08 15:54:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #705 from oshiho3/PT80956846_crop_search

Browse Source 
Fixes and improvement
This commit is contained in:
Taylor Griffin
2015-02-12 22:25:08 +11:00
parent 09a78d4661 3ed7edbfbf
commit abdc43ef40
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/alternate_name.rb
View File

@@ -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

1
app/models/crop.rb
View File

@@ -307,6 +307,7 @@ class Crop < ActiveRecord::Base
query: {
multi_match: {
query: "#{search_str}",
analyzer: "standard",
fields: ["name", "scientific_names.scientific_name", "alternate_names.name"]
}
},

2
app/models/scientific_name.rb
View File

@@ -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