Merge branch 'sismo' of github.com:afimb/chouette2 into sismo

2 files changed, 7 insertions, 4 deletions

diff --git a/app/assets/stylesheets/main/time_table_combinations.css.scss b/app/assets/stylesheets/main/time_table_combinations.css.scss
index 4cc0cfdc2..70dc2e535 100644
--- a/app/assets/stylesheets/main/time_table_combinations.css.scss
+++ b/app/assets/stylesheets/main/time_table_combinations.css.scss
@@ -1,6 +1,9 @@
-#combine_form{
-
+#modal_combine{
     .time_table_combination{
+
+        .radio input[type="radio"]{
+            position: inherit !important;
+        }
         
         .inputs{
             
diff --git a/app/views/time_table_combinations/_combine_form.html.erb b/app/views/time_table_combinations/_combine_form.html.erb
index e899ee1f8..8a651277e 100644
--- a/app/views/time_table_combinations/_combine_form.html.erb
+++ b/app/views/time_table_combinations/_combine_form.html.erb
@@ -2,7 +2,7 @@
   <div class="modal-body">
   <%= render "shared/flash_messages" %>
   <%= form.inputs do %>
-    <%= form.input :operation, :as => :radio, :collection => Hash[TimeTableCombination.operations.map {|b| [t( b, :scope => "time_table_combinations.operations"),b]}]  %>
+    <%= form.input :operation, :as => :radio, :collection => Hash[TimeTableCombination.operations.map {|b| [t( b, :scope => "time_table_combinations.operations"),b]}] %>
     <%= form.input :combined_name, :class =>  "typeahead", :input_html => { :class => "form-control" } %>
     <%= form.input :combined_id, :as => :hidden  %>
   <% end %>
@@ -34,7 +34,7 @@
         },
         {
           name: 'comment',
-          displayKey: 'name',
+          displayKey: 'comment',
           source: timeTableSuggestion.ttAdapter()
         }
       );