diff options
| author | cedricnjanga | 2017-09-26 00:29:18 +0200 |
|---|---|---|
| committer | cedricnjanga | 2017-09-26 00:29:18 +0200 |
| commit | b611a84ed724036c4929bd4c3eaa7e23ea314f45 (patch) | |
| tree | 957eaecb346a480a6fce3cfbb1d902552edb962f /lib | |
| parent | f59f05bbf073f90edd2ae0006f028d802b6ed675 (diff) | |
| parent | 733548a996d5e66c740f59d313eb031ddfcc9116 (diff) | |
| download | chouette-core-b611a84ed724036c4929bd4c3eaa7e23ea314f45.tar.bz2 | |
Merge branch 'master' into staging
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/model_attribute.rb | 5 |
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 |