diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/stop_areas_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb | 2 | ||||
| -rw-r--r-- | app/views/time_tables/_time_table.erb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/stop_areas_controller.rb b/app/controllers/stop_areas_controller.rb index 60600e2b4..77055853d 100644 --- a/app/controllers/stop_areas_controller.rb +++ b/app/controllers/stop_areas_controller.rb @@ -43,7 +43,7 @@ class StopAreasController < ChouetteController alias_method :stop_area, :resource def collection - @q = end_of_association_chain.search(params[:q]) + @q = parent.present? ? parent.stop_areas.search(params[:q]) : referential.stop_areas.search(params[:q]) @stop_areas ||= begin stop_areas = @q.result(:distinct => true).order(:name) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index fbd026356..630898405 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -34,7 +34,7 @@ <% else %> <li><%= link_to t("layouts.tabs.dashboard"), referential_path(@referential), :class => ("current" if current_page?(referential_path(@referential))) %></li> <li><%= tab_link_to Chouette::Network, referential_networks_path(@referential) %></li> - <li><%= tab_link_to t('activerecord.models.company'), referential_companies_path(@referential) %></li> + <li><%= tab_link_to Chouette::Company, referential_companies_path(@referential) %></li> <li><%= tab_link_to Chouette::Line, referential_lines_path(@referential) %></li> <li><%= tab_link_to Chouette::StopArea, referential_stop_areas_path(@referential) %></li> <li><%= tab_link_to Chouette::TimeTable, referential_time_tables_path(@referential) %></li> diff --git a/app/views/time_tables/_time_table.erb b/app/views/time_tables/_time_table.erb index ea2d69be4..6cb4289a3 100644 --- a/app/views/time_tables/_time_table.erb +++ b/app/views/time_tables/_time_table.erb @@ -1,4 +1,4 @@ -<%= div_for(time_table) do %> +<%= div_for(time_table, :class => "time_table") do %> <%= link_to time_table.comment, [@referential, time_table] %> <div class="info"> <div class="actions"> |