Use AreaType.label in StopArea parent type validation message. Refs #5515

2 files changed, 13 insertions, 2 deletions

diff --git a/app/models/chouette/stop_area.rb b/app/models/chouette/stop_area.rb
index 4f1359ff8..98c95f9a9 100644
--- a/app/models/chouette/stop_area.rb
+++ b/app/models/chouette/stop_area.rb
@@ -49,8 +49,10 @@ module Chouette
 
     def parent_area_type_must_be_greater
       return unless self.parent
-      if Chouette::AreaType.find(self.area_type) >= Chouette::AreaType.find(self.parent.area_type)
-        errors.add(:parent_id, I18n.t('stop_areas.errors.parent_area_type', area_type: self.parent.area_type))
+
+      parent_area_type = Chouette::AreaType.find(self.parent.area_type)
+      if Chouette::AreaType.find(self.area_type) >= parent_area_type
+        errors.add(:parent_id, I18n.t('stop_areas.errors.parent_area_type', area_type: parent_area_type.label))
       end
     end
 
diff --git a/spec/models/chouette/stop_area_spec.rb b/spec/models/chouette/stop_area_spec.rb
index 9db0f11a5..a90e5d816 100644
--- a/spec/models/chouette/stop_area_spec.rb
+++ b/spec/models/chouette/stop_area_spec.rb
@@ -1,3 +1,4 @@
+# coding: utf-8
 require 'spec_helper'
 
 describe Chouette::StopArea, :type => :model do
@@ -460,6 +461,14 @@ describe Chouette::StopArea, :type => :model do
       expect(stop_area.errors).to have_key(:parent_id)
     end
 
+    it "use parent area type label in validation error message" do
+      stop_area.area_type = 'zdep'
+      stop_area.parent.area_type = 'zdep'
+
+      stop_area.valid?
+      expect(stop_area.errors[:parent_id].first).to include(Chouette::AreaType.find(stop_area.parent.area_type).label)
+    end
+
   end
 
   describe '#waiting_time' do