aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/exports_controller.rb
diff options
context:
space:
mode:
authorLuc Donnet2015-01-15 16:40:30 +0100
committerLuc Donnet2015-01-15 16:40:30 +0100
commitc89c3508eb953e79165ba61aee878db8e4d15ff5 (patch)
treef59b362c96c13bd5facba44f356676f3383e6cd3 /app/controllers/exports_controller.rb
parentb9a4d3cde1604f4bea01551d8c85624a313a2dfe (diff)
parent7d984efe77efd8e610c91fcefc35c4a3e17412fd (diff)
downloadchouette-core-c89c3508eb953e79165ba61aee878db8e4d15ff5.tar.bz2
Fix tests and merge master
Diffstat (limited to 'app/controllers/exports_controller.rb')
-rw-r--r--app/controllers/exports_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/exports_controller.rb b/app/controllers/exports_controller.rb
index e8c140dd7..bb9cff197 100644
--- a/app/controllers/exports_controller.rb
+++ b/app/controllers/exports_controller.rb
@@ -14,8 +14,8 @@ class ExportsController < ChouetteController
end
def create
- if (params[:export][:type] == "HubExport") && Chouette::VehicleJourneyAtStop.all.count > 50000
- flash[:notice] = I18n.t("formtastic.titles.export.vjas.size", size: Chouette::VehicleJourneyAtStop.all.count)
+ if (params[:export][:type] == "HubExport") && Chouette::VehicleJourneyAtStop.count > 50000
+ flash[:notice] = I18n.t("formtastic.titles.export.vjas.size", size: Chouette::VehicleJourneyAtStop.count)
redirect_to new_referential_export_path(@referential)
elsif (params[:export][:type] == "HubExport") && (params[:export][:start_date].empty? || params[:export][:end_date].empty?)
flash[:notice] = I18n.t("formtastic.titles.export.dates.not_nul")