aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers
diff options
context:
space:
mode:
authorLuc Donnet2014-09-25 18:07:22 +0200
committerLuc Donnet2014-09-25 18:07:22 +0200
commit203bca6993fc87f78c018b5d973196db700b84f4 (patch)
tree36f05bd4edc7e345ea1be184599a7113c2b6ccec /app/controllers
parent7b8234c96105f154ebaf492a0e104456986b6198 (diff)
parentf3e8dc276a23474c6b5601c988df6b036ca4fdfa (diff)
downloadchouette-core-203bca6993fc87f78c018b5d973196db700b84f4.tar.bz2
Merge branch 'sismo' of github.com:afimb/chouette2 into sismo
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/access_links_controller.rb4
-rw-r--r--app/controllers/access_points_controller.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/access_links_controller.rb b/app/controllers/access_links_controller.rb
index 31d183034..b22dd75a8 100644
--- a/app/controllers/access_links_controller.rb
+++ b/app/controllers/access_links_controller.rb
@@ -19,8 +19,8 @@ class AccessLinksController < ChouetteController
@access_point = Chouette::AccessPoint.find(params[:access_point_id])
@access_link = Chouette::AccessLink.find(params[:id])
@stop_area = @access_link.stop_area
- show! do
- build_breadcrumb :show
+ show! do |format|
+ format.html {build_breadcrumb :show}
end
end
diff --git a/app/controllers/access_points_controller.rb b/app/controllers/access_points_controller.rb
index 8e1f4664b..ca8e0b156 100644
--- a/app/controllers/access_points_controller.rb
+++ b/app/controllers/access_points_controller.rb
@@ -30,7 +30,7 @@ class AccessPointsController < ChouetteController
}
end
- build_breadcrumb :show
+ format.html {build_breadcrumb :show}
end
end