diff options
| author | Xinhui | 2016-09-21 17:38:30 +0200 | 
|---|---|---|
| committer | Xinhui | 2016-09-21 17:38:30 +0200 | 
| commit | d5d1923112cf4c47b78b7fe415c0f638a96c7074 (patch) | |
| tree | f7785facdeb5fa85e6390f802d1afe6babe26963 /app/views | |
| parent | 9ccb414f3144eb7c17ab69d3cb5d94b11d915aa9 (diff) | |
| download | chouette-core-d5d1923112cf4c47b78b7fe415c0f638a96c7074.tar.bz2 | |
Fix error on StopArea#show with AccessPoint
refs #1685
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/access_points/_access_point.html.slim | 10 | ||||
| -rw-r--r-- | app/views/access_points/index.html.slim | 6 | ||||
| -rw-r--r-- | app/views/referential_stop_areas/show.html.slim | 12 | ||||
| -rw-r--r-- | app/views/stop_areas/show.html.slim | 3 | 
4 files changed, 15 insertions, 16 deletions
| diff --git a/app/views/access_points/_access_point.html.slim b/app/views/access_points/_access_point.html.slim index b10883eba..bb627e42f 100644 --- a/app/views/access_points/_access_point.html.slim +++ b/app/views/access_points/_access_point.html.slim @@ -2,19 +2,19 @@    .panel-heading      .panel-title.clearfix        span.pull-right -        = link_to edit_referential_stop_area_access_point_path(@referential, @stop_area, access_point), class: 'btn btn-default btn-sm' do +        = link_to edit_referential_stop_area_access_point_path(referential, @stop_area, access_point), class: 'btn btn-default btn-sm' do            span.fa.fa-pencil -        = link_to referential_stop_area_access_point_path(@referential, @stop_area, access_point), method: :delete, data: {:confirm =>  t('access_points.actions.destroy_confirm')}, class: 'btn btn-danger btn-sm' do +        = link_to referential_stop_area_access_point_path(referential, @stop_area, access_point), method: :delete, data: {:confirm =>  t('access_points.actions.destroy_confirm')}, class: 'btn btn-danger btn-sm' do            span.fa.fa-trash-o        h5 -        = link_to [@referential, @stop_area, access_point], class: 'preview', title: "#{Chouette::StopArea.model_name.human.capitalize} #{access_point.name}" do +        = link_to referential_stop_area_access_point_path(referential, @stop_area, access_point), class: 'preview', title: "#{Chouette::StopArea.model_name.human.capitalize} #{access_point.name}" do            span.name              = image_tag "map/access_#{access_point.access_point_type}.png"              = truncate(access_point.name, :length => 20) -   +    .panel-body      - unless access_point.geometry        p          span.warning = t('.no_position')          = " -" -    p = t("access_types.label.#{access_point.access_point_type}")
\ No newline at end of file +    p = t("access_types.label.#{access_point.access_point_type}") diff --git a/app/views/access_points/index.html.slim b/app/views/access_points/index.html.slim index b48abc970..638ca22f5 100644 --- a/app/views/access_points/index.html.slim +++ b/app/views/access_points/index.html.slim @@ -14,12 +14,12 @@    = page_entries_info @access_points  .access_points.paginated_content -  = render partial: 'access_point', collection: @access_points +  = render partial: 'access_point', collection: @access_points, locals: {referential: @referential}  .pagination    = will_paginate @access_points, container: false  - content_for :sidebar do    ul.actions -    li  -      = link_to t('access_points.actions.new'), new_referential_stop_area_access_point_path(@referential,@stop_area), class: 'add'
\ No newline at end of file +    li +      = link_to t('access_points.actions.new'), new_referential_stop_area_access_point_path(@referential,@stop_area), class: 'add' diff --git a/app/views/referential_stop_areas/show.html.slim b/app/views/referential_stop_areas/show.html.slim index 2224728e9..76414edf0 100644 --- a/app/views/referential_stop_areas/show.html.slim +++ b/app/views/referential_stop_areas/show.html.slim @@ -61,7 +61,7 @@  	    p          label = "#{@stop_area.human_attribute_name('stairs_availability')} : " -	       +          - if !@stop_area.stairs_availability.nil?            = t((@stop_area.stairs_availability == true).to_s)          - else @@ -115,7 +115,7 @@ p.after_map    div      h3 = t('.access_points')      .access_points.paginated_content -      = paginated_content @access_points, "access_points/access_point" +      = paginated_content @access_points, "access_points/access_point", {referential: @referential}  - content_for :sidebar do    table @@ -146,11 +146,11 @@ p.after_map            ul.actions              li                = link_to t('stop_areas.actions.select_parent'), select_parent_referential_stop_area_path(@referential, @stop_area), class: 'parent' -             +              - if @stop_area.parent == nil                li                  = link_to t('stop_areas.actions.clone_as_parent'), new_referential_stop_area_stop_area_copy_path(@referential, @stop_area, hierarchy: 'parent'), class: 'clone' -             +              - if manage_children                li                  = link_to t('stop_areas.actions.add_children'), add_children_referential_stop_area_path(@referential, @stop_area), class: 'children' @@ -168,5 +168,5 @@ p.after_map                  = link_to t('stop_areas.actions.manage_access_links'), access_links_referential_stop_area_path(@referential,@stop_area), class: 'access_link'    br -   -  = creation_tag(@stop_area)
\ No newline at end of file + +  = creation_tag(@stop_area) diff --git a/app/views/stop_areas/show.html.slim b/app/views/stop_areas/show.html.slim index 06ca09dd5..e9ea11d3b 100644 --- a/app/views/stop_areas/show.html.slim +++ b/app/views/stop_areas/show.html.slim @@ -116,8 +116,7 @@ p.after_map      h3 = t('.access_points')      .access_points.paginated_content -      / FIXME #821 -      = paginated_content @access_points, "access_points/access_point" +      = paginated_content @access_points, "access_points/access_point", {referential: @stop_area_referential}  - content_for :sidebar do    table | 
