Merge pull request #13786 from imtayadeway/fix/miq-expression-is-field

Ensure field model name is model

lib/miq_expression/field.rb

@@ -31,10 +31,12 @@ def date?
   end
 
   def self.is_field?(field)
-    if field.kind_of?(String)
-      match = FIELD_REGEX.match(field)
-      match.present? && match[:model_name].safe_constantize.present?
-    end
+    return false unless field.kind_of?(String)
+    match = FIELD_REGEX.match(field)
+    return false unless match
+    model = match[:model_name].safe_constantize
+    return false unless model
+    !!(model < ApplicationRecord)
   end
 
   def datetime?

spec/lib/miq_expression/field_spec.rb

@@ -232,6 +232,7 @@
 
     it "does not detect a string to looks like a field but isn't" do
       expect(MiqExpression::Field.is_field?("NetworkManager-team")).to be_falsey
+      expect(described_class.is_field?("ManageIQ-name")).to be(false)
     end
   end
 end