diff options
| author | Bruno Perles | 2016-01-21 16:24:30 +0100 |
|---|---|---|
| committer | Bruno Perles | 2016-01-21 16:24:30 +0100 |
| commit | 633004afc5861a6e8158948ddfecd73bf4dd86a8 (patch) | |
| tree | 661f22efc50bef6e2744d1d8b69153a0e9e0a696 | |
| parent | 5d71d0bb118ef7231b25606c1556756c9ef76da3 (diff) | |
| download | chouette-core-633004afc5861a6e8158948ddfecd73bf4dd86a8.tar.bz2 | |
Fix bugs #42072 and #42073 and more for UIafimb-master
| -rw-r--r-- | app/views/referentials/_counts.html.erb | 2 | ||||
| -rw-r--r-- | app/views/vehicle_journey_frequencies/_show_sidebar.html.erb | 2 | ||||
| -rw-r--r-- | app/views/vehicle_journeys/_vehicle_journeys.html.erb | 2 | ||||
| -rw-r--r-- | config/secrets.yml | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/app/views/referentials/_counts.html.erb b/app/views/referentials/_counts.html.erb index 20078429b..ebe91aebf 100644 --- a/app/views/referentials/_counts.html.erb +++ b/app/views/referentials/_counts.html.erb @@ -33,7 +33,7 @@ </li> <li class="list-group-item"> <span class="badge"><%= @referential.route_sections.size %></span> - <%= link_to Referential.human_attribute_name("route_sections"), referential_route_sections_path(@referential) %> + <%= Referential.human_attribute_name("route_sections") %> </li> <li class="list-group-item"> <span class="badge"><%= @referential.stop_areas.size %></span> diff --git a/app/views/vehicle_journey_frequencies/_show_sidebar.html.erb b/app/views/vehicle_journey_frequencies/_show_sidebar.html.erb index 2a7be143c..a63dd0a6b 100644 --- a/app/views/vehicle_journey_frequencies/_show_sidebar.html.erb +++ b/app/views/vehicle_journey_frequencies/_show_sidebar.html.erb @@ -15,7 +15,7 @@ </li> <li> <%= link_to t('vehicle_journeys.actions.destroy'), - referential_line_route_vehicle_journey_path(@referential, @line, @route, @vehicle_journey_frequency), + referential_line_route_vehicle_journey_frequency_path(@referential, @line, @route, @vehicle_journey_frequency), method: :delete, data: { confirm: t('vehicle_journeys.actions.destroy_confirm') }, class: "remove" %> </li> </ul> diff --git a/app/views/vehicle_journeys/_vehicle_journeys.html.erb b/app/views/vehicle_journeys/_vehicle_journeys.html.erb index 71a28ec6e..c321b960b 100644 --- a/app/views/vehicle_journeys/_vehicle_journeys.html.erb +++ b/app/views/vehicle_journeys/_vehicle_journeys.html.erb @@ -5,7 +5,7 @@ <% if controller_name == 'vehicle_journey_frequencies' && exist_vehicle_journeys?(@route) %> <i class="fa fa-clock-o"></i> <%= link_to t("vehicle_journeys.actions.show"), referential_line_route_vehicle_journeys_path(@referential, @line, @route) %> - <% elsif exist_vehicle_journey_frequencies?(@route) %> + <% elsif controller_name == 'vehicle_journeys' && exist_vehicle_journey_frequencies?(@route) %> <i class="fa fa-clock-o"></i> <%= link_to t("vehicle_journey_frequencies.actions.show"), referential_line_route_vehicle_journey_frequencies_path(@referential, @line, @route) %> <% end %> diff --git a/config/secrets.yml b/config/secrets.yml index a1eea33ac..2f9d5abe6 100644 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -16,14 +16,14 @@ development: google_analytic_tracker: "UA-AAAAAAAA" # geoportail_api_key: "aaaaaaaaaaaaaaaaaaaaaa" newrelic_licence_key: "" - osrm_endpoint: "http//router.project-osrm.org" + osrm_endpoint: "http://router.project-osrm.org" test: secret_key_base: 54f61aab23322611dd0bbf73b7f034db34281f7f4b3c4992eaaff20ecc9673bbd467beaa6fcb48379ca69b80bc5662deac4e33ca144f2482146123d3e966016a api_endpoint: "http://localhost:8080/chouette_iev/" google_analytic_tracker: "UA-AAAAAAAA" # geoportail_api_key: "aaaaaaaaaaaaaaaaaaaaaa" - osrm_endpoint: "http//router.project-osrm.org" + osrm_endpoint: "http://router.project-osrm.org" # Do not keep production secrets in the repository, # instead read values from the environment. @@ -33,4 +33,4 @@ production: google_analytic_tracker: "UA-AAAAAAAA" # geoportail_api_key: "aaaaaaaaaaaaaaaaaaaaaa" newrelic_licence_key: "" - osrm_endpoint: "" + osrm_endpoint: "http://router.project-osrm.org" |