aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZog2018-01-12 09:23:06 +0100
committerZog2018-01-12 09:23:06 +0100
commit41d2f53af34457c66cf3d504ac1bba610d11d596 (patch)
tree5672bcfd20b8fa6bd1c5fb85b8632c0093f65e1b
parent216821cbc5410a1377dd57b09ee2753aee13e37c (diff)
downloadchouette-core-41d2f53af34457c66cf3d504ac1bba610d11d596.tar.bz2
Refs #5560; Add validation on CustomField5560-add-validation-on-customfields
-rw-r--r--app/models/custom_field.rb3
-rw-r--r--spec/models/custom_field_spec.rb1
2 files changed, 3 insertions, 1 deletions
diff --git a/app/models/custom_field.rb b/app/models/custom_field.rb
index e8e76c6b5..3f79ec62c 100644
--- a/app/models/custom_field.rb
+++ b/app/models/custom_field.rb
@@ -1,7 +1,8 @@
class CustomField < ActiveRecord::Base
extend Enumerize
- enumerize :field_type, in: %i{list}
+ enumerize :field_type, in: %i{list}
validates :name, uniqueness: {scope: :resource_type}
+ validates :code, uniqueness: {scope: :resource_type, case_sensitive: false}
end
diff --git a/spec/models/custom_field_spec.rb b/spec/models/custom_field_spec.rb
index 6ebf994db..8a6d0cb41 100644
--- a/spec/models/custom_field_spec.rb
+++ b/spec/models/custom_field_spec.rb
@@ -5,6 +5,7 @@ RSpec.describe CustomField, type: :model do
context "validates" do
it { should validate_uniqueness_of(:name).scoped_to(:resource_type) }
+ it { should validate_uniqueness_of(:code).scoped_to(:resource_type).case_insensitive }
end
context "field access" do