diff options
| author | cedricnjanga | 2018-05-28 20:49:05 -0700 |
|---|---|---|
| committer | cedricnjanga | 2018-05-28 22:10:07 -0700 |
| commit | 1eb8391bf23bd3108445ae453a9a490a48fff33d (patch) | |
| tree | c9c8361c6292e5091e84b42ff4c9343dbd9f5fc7 | |
| parent | 415b2e285553ec0bb06de90c242a8fa519b401b4 (diff) | |
| download | chouette-core-1eb8391bf23bd3108445ae453a9a490a48fff33d.tar.bz2 | |
Refs #5642 Display local_code & zip_code in #show, #edit & #new5642-insee-code
| -rw-r--r-- | app/views/stop_areas/_filters.html.slim | 2 | ||||
| -rw-r--r-- | app/views/stop_areas/show.html.slim | 13 |
2 files changed, 7 insertions, 8 deletions
diff --git a/app/views/stop_areas/_filters.html.slim b/app/views/stop_areas/_filters.html.slim index fcf8036a1..34bc8ce3f 100644 --- a/app/views/stop_areas/_filters.html.slim +++ b/app/views/stop_areas/_filters.html.slim @@ -9,7 +9,7 @@ span.fa.fa-search .ffg-row - = f.input :zip_code_cont, placeholder: t('.zip_code'), label: Chouette::StopArea.tmf('zip_code'), required: false, wrapper_html: {class: filter_item_class(params[:q], :zip_code_cont)} + = f.input :zip_code_cont, placeholder: t('.zip_code'), label: Chouette::StopArea.tmf(:zip_code), required: false, wrapper_html: {class: filter_item_class(params[:q], :zip_code_cont)} = f.input :city_name_cont, placeholder: t('.city_name'), label: Chouette::StopArea.tmf(:city_name), required: false, wrapper_html: {class: filter_item_class(params[:q], :city_name_cont)} .form-group.togglable class=filter_item_class(params[:q], :area_type_eq_any) diff --git a/app/views/stop_areas/show.html.slim b/app/views/stop_areas/show.html.slim index c083fcd0b..c1ee7f192 100644 --- a/app/views/stop_areas/show.html.slim +++ b/app/views/stop_areas/show.html.slim @@ -17,13 +17,12 @@ }) - attributes.merge!(Chouette::StopArea.tmf('waiting_time') => @stop_area.waiting_time_text) if has_feature?(:stop_area_waiting_time) - attributes.merge!({ "Coordonnées" => geo_data(@stop_area, @stop_area_referential), - Chouette::StopArea.tmf('zip_code') => @stop_area.zip_code, - Chouette::StopArea.tmf('local_code') => @stop_area.try(:local_code), - Chouette::StopArea.tmf('city_name') => @stop_area.city_name, - Chouette::StopArea.tmf('country_code') => @stop_area.country_code.presence || '-', - Chouette::StopArea.tmf('time_zone') => @stop_area.time_zone.presence || '-', - Chouette::StopArea.tmf('status') => stop_area_status(@stop_area.status), - Chouette::StopArea.tmf('comment') => @stop_area.try(:comment), + Chouette::StopArea.tmf(:zip_code) => @stop_area.zip_code, + Chouette::StopArea.tmf(:local_code) => @stop_area.try(:local_code), + Chouette::StopArea.tmf(:city_name) => @stop_area.city_name, + Chouette::StopArea.tmf(:country_code) => @stop_area.country_code.presence || '-', + t('activerecord.attributes.stop_area.state') => stop_area_status(@stop_area), + Chouette::StopArea.tmf(:comment) => @stop_area.try(:comment), }) - @stop_area.custom_fields.each do |code, field| - attributes.merge!(field.name => field.display_value) |