diff options
| author | Michel Etienne | 2012-04-12 16:19:59 +0200 |
|---|---|---|
| committer | Michel Etienne | 2012-04-12 16:19:59 +0200 |
| commit | 87cea063f5bd2999f21719bc39702257dfb66cc7 (patch) | |
| tree | 3b8258dcc71eb5efe0de0f8d5e356ff64169785f | |
| parent | 370f8c62e32c3a94be84834b9a8c3b7959c27d3e (diff) | |
| parent | ef16bc107b87f2157e9c38a02da5bc085ae43f4f (diff) | |
| download | chouette-core-87cea063f5bd2999f21719bc39702257dfb66cc7.tar.bz2 | |
Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2
| -rw-r--r-- | Gemfile.lock | 8 | ||||
| -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 |
4 files changed, 7 insertions, 7 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index c4d546fa1..6bd050f69 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://chouette.dryade.priv/ninoxe - revision: 9e968fd6886f46dd0db471d8a7d8518e932b9e79 + revision: 3c5379299d789aa0764874e3c122c75735bf8a13 specs: ninoxe (0.0.8) GeoRuby @@ -177,8 +177,8 @@ GEM jruby-openssl (0.7.4) bouncy-castle-java jruby-rack (1.1.2) - json (1.6.5) - json (1.6.5-java) + json (1.6.6) + json (1.6.6-java) launchy (2.0.5) addressable (~> 2.2.6) launchy (2.0.5-java) @@ -291,7 +291,7 @@ GEM treetop (1.4.10) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.32) + tzinfo (0.3.33) uglifier (1.2.1) execjs (>= 0.3.0) multi_json (>= 1.0.2) 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"> |