Fix data-pre render for stop areas and add time_table with token input Refs #0028814

4 files changed, 21 insertions, 3 deletions

diff --git a/app/views/stop_areas/add_children.html.erb b/app/views/stop_areas/add_children.html.erb
index 33cc81b27..732e28466 100644
--- a/app/views/stop_areas/add_children.html.erb
+++ b/app/views/stop_areas/add_children.html.erb
@@ -3,7 +3,7 @@
 <%= semantic_form_for [@referential, @stop_area] do |form| %>
 <div>
   <%= form.inputs do %>
-    <%= form.input :children_ids, :as => :search_stop_area, :json => referential_stop_area_stop_area_children_path(@referential, @stop_area, :format => :json), :hint_text => t('search_hint'), :no_result_text => t('no_result_text'),:searching_text => t('searching_term'), :input_html => { :"data-pre" => ( @children.map { |child| { :id => child.id.to_s, :name => "#{child.name}" } } ).to_json }  %>
+    <%= form.input :children_ids, :as => :search_stop_area, :json => referential_stop_area_stop_area_children_path(@referential, @stop_area, :format => :json), :hint_text => t('search_hint'), :no_result_text => t('no_result_text'),:searching_text => t('searching_term'), :input_html => { :"data-pre" => Rabl::Renderer.new('stop_areas/index', @children, :view_path => 'app/views', :format => :json).render }  %>
   <% end %>
 
    <%= form.actions do %>
diff --git a/app/views/stop_areas/index.rabl b/app/views/stop_areas/index.rabl
new file mode 100644
index 000000000..72b736858
--- /dev/null
+++ b/app/views/stop_areas/index.rabl
@@ -0,0 +1,9 @@
+collection @stop_areas
+
+node do |stop_area|
+  { :id => stop_area.id, :name => stop_area.name || "", :zip_code => stop_area.zip_code || "", :city_name => stop_area.city_name || "" }  
+end
+
+node :area_type do |area|
+  I18n.t("area_types.label.#{area.area_type.underscore}") || ""
+end
\ No newline at end of file
diff --git a/app/views/stop_areas/select_parent.html.erb b/app/views/stop_areas/select_parent.html.erb
index 9bd25f4dd..9909e49d0 100644
--- a/app/views/stop_areas/select_parent.html.erb
+++ b/app/views/stop_areas/select_parent.html.erb
@@ -2,8 +2,8 @@
 
 <%= semantic_form_for [@referential, @stop_area] do |form| %>
 <div>
-  <%= form.inputs do %>
-    <%= form.input :parent_id, :as => :search_stop_area, :json => referential_stop_area_stop_area_parents_path(@referential, @stop_area, :format => :json), :tokenLimit => 1, :hint_text => t('search_hint'), :no_result_text => t('no_result_text'),:searching_text => t('searching_term'), :input_html => { :"data-pre" => ( @parent.present? ? [ { :id => @parent.id.to_s, :name => "#{@parent.name}" } ]: [] ).to_json }  %>
+  <%= form.inputs do %>    
+    <%= form.input :parent_id, :as => :search_stop_area, :json => referential_stop_area_stop_area_parents_path(@referential, @stop_area, :format => :json), :hint_text => t('search_hint'), :no_result_text => t('no_result_text'), :searching_text => t('searching_term'), :input_html => { :"data-pre" => Rabl::Renderer.new('stop_areas/show', [@parent], :view_path => 'app/views', :format => :json).render }  %>
   <% end %>
 
    <%= form.actions do %>
diff --git a/app/views/stop_areas/show.rabl b/app/views/stop_areas/show.rabl
new file mode 100644
index 000000000..a03a3511d
--- /dev/null
+++ b/app/views/stop_areas/show.rabl
@@ -0,0 +1,9 @@
+object @stop_area
+
+node do |stop_area|
+  { :id => stop_area.id, :name => stop_area.name || "", :zip_code => stop_area.zip_code || "", :city_name => stop_area.city_name || "" }  
+end
+
+node :area_type do |area|
+  I18n.t("area_types.label.#{area.area_type.underscore}") || ""
+end