2 files changed, 26 insertions, 4 deletions
diff --git a/app/models/concerns/custom_fields_support.rb b/app/models/concerns/custom_fields_support.rb
index e8ecfcb7c..d562cf227 100644
--- a/app/models/concerns/custom_fields_support.rb
+++ b/app/models/concerns/custom_fields_support.rb
@@ -2,18 +2,25 @@ module CustomFieldsSupport
   extend ActiveSupport::Concern
 
   included do
+    validate :custom_fields_values_are_valid
+
     def self.custom_fields
       CustomField.where(resource_type: self.name.split("::").last)
     end
 
     def custom_fields
       HashWithIndifferentAccess[*self.class.custom_fields.map do |v|
-        [v.code, CustomField::Value.new(v, custom_field_value(v.code))]
+        [v.code, CustomField::Value.new(self, v, custom_field_value(v.code))]
       end.flatten]
     end
 
     def custom_field_value key
       (custom_field_values || {})[key.to_s]
     end
+
+    private
+    def custom_fields_values_are_valid
+      custom_fields.values.all?{|cf| cf.valid?}
+    end
   end
 end
diff --git a/app/models/custom_field.rb b/app/models/custom_field.rb
index 2572d5c80..5a7c1954c 100644
--- a/app/models/custom_field.rb
+++ b/app/models/custom_field.rb
@@ -8,17 +8,18 @@ class CustomField < ActiveRecord::Base
   validates :code, uniqueness: {scope: [:resource_type, :workgroup_id], case_sensitive: false}
 
   class Value
-    def self.new custom_field, value
+    def self.new owner, custom_field, value
       field_type = custom_field.options["field_type"]
       klass_name = field_type && "CustomField::Value::#{field_type.classify}"
       klass = klass_name && const_defined?(klass_name) ? klass_name.constantize : CustomField::Value::Base
-      klass.new custom_field, value
+      klass.new owner, custom_field, value
     end
 
     class Base
-      def initialize custom_field, value
+      def initialize owner, custom_field, value
         @custom_field = custom_field
         @raw_value = value
+        @owner = owner
       end
 
       %i(code name field_type options).each do |attr|
@@ -27,15 +28,29 @@ class CustomField < ActiveRecord::Base
         end
       end
 
+      def valid?
+        true
+      end
+
       def value
         @raw_value
       end
+
+      def errors_key
+        "custom_fields.#{code}"
+      end
     end
 
     class Integer < Base
       def value
         @raw_value.to_i
       end
+
+      def valid?
+        unless ActiveRecord::Base::NumericalityValidator.new(attributes: 42).send(:parse_raw_value_as_an_integer, @raw_value).present?
+          @owner.errors.add errors_key, "'#{@raw_value}' is not a valid integer"
+        end
+      end
     end
 
     class String < Base