Sort lines and use display name (with company name when available). Refs #1997

2 files changed, 11 insertions, 7 deletions

diff --git a/app/models/chouette/line.rb b/app/models/chouette/line.rb
index 80b901bd4..3f7a72021 100644
--- a/app/models/chouette/line.rb
+++ b/app/models/chouette/line.rb
@@ -67,4 +67,8 @@ class Chouette::Line < Chouette::ActiveRecord
     self.vehicle_journeys.unscoped.where(journey_category: 1).count > 0
   end
 
+  def display_name
+    [name, company.try(:name)].compact.join(' - ')
+  end
+
 end
diff --git a/app/views/referentials/_form.html.slim b/app/views/referentials/_form.html.slim
index 777c942f4..f130f490f 100644
--- a/app/views/referentials/_form.html.slim
+++ b/app/views/referentials/_form.html.slim
@@ -2,25 +2,25 @@
   .row
     .col-lg-8.col-md-8.col-sm-7.col-xs-8
       = form.input :name
-      
+
     - if @referential.new_record?
       - if @referential.created_from
         .col-lg-2.col-md-2.col-sm-3.col-xs-2
           = form.input :created_from, input_html: { value: @referential.created_from.name}
-          
+
         .col-lg-2.col-md-2.col-sm-2.col-xs-2
           = form.input :slug, :input_html => { title: t("formtastic.titles.referential.slug") }
       - else
         .col-lg-4.col-md-4.col-sm-5.col-xs-4
           = form.input :slug, :input_html => { title: t("formtastic.titles.referential.slug") }
-      
+
     - else
       - if @referential.created_from
         .col-lg-2.col-md-2.col-sm-2.col-xs-2
           label.control-label = @referential.human_attribute_name('slug')
           br
           = @referential.slug
-          
+
         .col-lg-2.col-md-2.col-sm-2.col-xs-2
           label.control-label = @referential.human_attribute_name('created_from')
           = @referential.created_from.name
@@ -35,11 +35,11 @@
       = form.input :prefix, input_html: { title: t("formtastic.titles.referential.prefix") }
     .col-lg-7.col-md-7.col-sm-7.col-xs-7
       = form.input :projection_type, as: :select, collection: Referential.available_srids
-  
+
   .row
     .col-lg-6.col-md-6.col-sm-6.col-xs-6
       = form.input :time_zone
-  
+
   .row
     .col-lg-6.col-md-6.col-sm-6.col-xs-6
       = form.input :upper_corner, input_html: {title: t("formtastic.titles.referential.upper_corner")}
@@ -59,7 +59,7 @@
         = subform.input :first_period_end, as: :date, html5: true, input_html: { style: 'width: 100%' }
     .row
       .col-lg-8.col-md-12.col-sm-12.col-xs-12
-        = subform.input :lines, as: :select, collection: @referential.workbench.lines, selected: subform.object.line_ids, input_html: { 'data-select2ed': 'true', 'data-select2ed-placeholder': 'Sélection de lignes', 'multiple': 'multiple', style: 'width: 100%' }
+        = subform.input :lines, as: :select, collection: @referential.workbench.lines.order(:name), selected: subform.object.line_ids, label_method: :display_name, input_html: { 'data-select2ed': 'true', 'data-select2ed-placeholder': 'Sélection de lignes', 'multiple': 'multiple', style: 'width: 100%' }
 
   = form.input :workbench_id, as: :hidden