Merge pull request #4337 from Growstuff/recursive-fallback

More recursive companions

app/helpers/crops_helper.rb

@@ -5,7 +5,9 @@ module CropsHelper
   def crop_or_parent(crop, attribute)
     default = crop.send(attribute)
     return default if default.present?
-    return crop.parent.send(attribute) if crop.parent&.send(attribute).present?
+    while parent = crop.parent do
+      return parent.send(attribute) if parent&.send(attribute).present?
+    end
 
     # For scopes, arrays, etc return the empty value
     default

app/models/crop.rb

@@ -162,7 +162,7 @@ class Crop < ApplicationRecord
   def all_companions
     return companions unless parent
 
-    (companions + parent.companions).uniq
+    (companions + parent.all_companions).uniq
   end
 
   before_destroy :destroy_reverse_companionships