aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers
diff options
context:
space:
mode:
authorLuc Donnet2014-09-18 08:39:57 +0200
committerLuc Donnet2014-09-18 08:39:57 +0200
commit83ef73e839e2b9efd71fe74ab993cdf1ffa66903 (patch)
tree48690e27f30437eaf7dafe4166f8c9df5c4f55d1 /app/controllers
parentdd081b8b95ab74ab9702dcf1035ae8f1b4c0289a (diff)
downloadchouette-core-83ef73e839e2b9efd71fe74ab993cdf1ffa66903.tar.bz2
Fix data-pre render for stop areas and add time_table with token input Refs #0028814
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/time_tables_controller.rb10
1 files changed, 1 insertions, 9 deletions
diff --git a/app/controllers/time_tables_controller.rb b/app/controllers/time_tables_controller.rb
index 586713c60..2a4042521 100644
--- a/app/controllers/time_tables_controller.rb
+++ b/app/controllers/time_tables_controller.rb
@@ -33,10 +33,7 @@ class TimeTablesController < ChouetteController
end
def comment_filter
- respond_to do |format|
- format.json { render :json => filtered_time_tables_maps}
- end
-
+ @time_tables = filtered_time_tables
end
def index
@@ -68,11 +65,6 @@ class TimeTablesController < ChouetteController
protected
- def filtered_time_tables_maps
- filtered_time_tables.collect do |time_table|
- { :id => time_table.id, :name => time_table_description(time_table) }
- end
- end
def filtered_time_tables
referential.time_tables.select{ |t| t.comment =~ /#{params[:q]}/i }
end