diff options
| -rw-r--r-- | app/helpers/breadcrumb_helper.rb | 4 | ||||
| -rw-r--r-- | app/views/stop_areas/show.html.slim | 15 | ||||
| -rw-r--r-- | db/seeds.rb | 4 |
3 files changed, 12 insertions, 11 deletions
diff --git a/app/helpers/breadcrumb_helper.rb b/app/helpers/breadcrumb_helper.rb index 91f3a56c0..6c29a3675 100644 --- a/app/helpers/breadcrumb_helper.rb +++ b/app/helpers/breadcrumb_helper.rb @@ -99,8 +99,8 @@ module BreadcrumbHelper def stop_area_breadcrumb(action) referential_breadcrumb - add_breadcrumb Chouette::StopArea.model_name.human(:count => 2), referential_stop_areas_path(@stop_area.stop_area_referential) unless action == :index - add_breadcrumb breadcrumb_label(@stop_area), referential_stop_area_path(@stop_area.stop_area_referential, @stop_area),:title => breadcrumb_tooltip(@stop_area) if action == :edit + add_breadcrumb Chouette::StopArea.model_name.human(:count => 2), stop_area_referential_stop_areas_path(@stop_area.stop_area_referential) unless action == :index + add_breadcrumb breadcrumb_label(@stop_area), stop_area_referential_stop_area_path(@stop_area.stop_area_referential, @stop_area),:title => breadcrumb_tooltip(@stop_area) if action == :edit end def stop_area_copy_breadcrumb(action) diff --git a/app/views/stop_areas/show.html.slim b/app/views/stop_areas/show.html.slim index e9ea11d3b..c9d0b67a3 100644 --- a/app/views/stop_areas/show.html.slim +++ b/app/views/stop_areas/show.html.slim @@ -127,13 +127,14 @@ p.after_map li = link_to t('stop_areas.actions.edit'), edit_stop_area_referential_stop_area_path(@stop_area_referential, @stop_area), class: 'edit' li = link_to t('stop_areas.actions.destroy'), stop_area_referential_stop_area_path(@stop_area_referential, @stop_area), method: :delete, :data => {:confirm => t('stop_areas.actions.destroy_confirm')}, class: 'remove' - - if manage_itl - tr - td - h4 = t(".itl_managment") - ul.actions - li = link_to t('stop_areas.actions.add_routing_lines'), add_routing_lines_stop_area_referential_stop_area_path(@stop_area_referential, @stop_area), class: 'add_routing_lines' - li = link_to t('stop_areas.actions.add_routing_stops'), add_routing_stops_stop_area_referential_stop_area_path(@stop_area_referential, @stop_area), class: 'add_routing_stops' + - if manage_itl #Fixme + + / tr + / td + / h4 = t(".itl_managment") + / ul.actions + / li = link_to t('stop_areas.actions.add_routing_lines'), add_routing_lines_stop_area_referential_stop_area_path(@stop_area_referential, @stop_area), class: 'add_routing_lines' + / li = link_to t('stop_areas.actions.add_routing_stops'), add_routing_stops_stop_area_referential_stop_area_path(@stop_area_referential, @stop_area), class: 'add_routing_stops' - else tr diff --git a/db/seeds.rb b/db/seeds.rb index 9d91a9e85..195729c3a 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -19,8 +19,8 @@ end OfferWorkbench.find_or_create_by(name: "Gestion de l'offre", organisation: stif) -operator = Organisation.find_or_create_by!(name: 'Transporteur A') do |organisation| - organisation.code = "transporteur-a" +operator = Organisation.find_or_create_by!(code: 'transporteur-a') do |organisation| + organisation.name = "Transporteur A" end operator.users.find_or_create_by!(username: "transporteur") do |user| |