aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorGuillaume2017-09-25 15:26:05 +0200
committerGuillaume2017-09-25 15:26:05 +0200
commit2fa5b41379f33b399121dca1149dd7b20cf6d00d (patch)
treeaf5e86983b3bd9a04cf064ed064fe73c76504ace /lib
parent903cc58aa530385f6fc3ceba3bbbacf46f4cd316 (diff)
parent4e878caf4170f9be96f0c854761ed279b057e91c (diff)
downloadchouette-core-2fa5b41379f33b399121dca1149dd7b20cf6d00d.tar.bz2
Merge branch 'master' of https://github.com/af83/stif-boiv
Diffstat (limited to 'lib')
-rw-r--r--lib/model_attribute.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/model_attribute.rb b/lib/model_attribute.rb
index 60580e306..4d246853a 100644
--- a/lib/model_attribute.rb
+++ b/lib/model_attribute.rb
@@ -12,9 +12,9 @@ class ModelAttribute
def self.classes
all
.map(&:klass)
+ .uniq
.map(&:to_s)
.map(&:camelize)
- .uniq
end
def self.group_by_class
@@ -93,7 +93,8 @@ class ModelAttribute
end
def ==(other)
- klass == other.klass &&
+ self.class === other &&
+ klass == other.klass &&
name == other.name &&
data_type == other.data_type
end