aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers
diff options
context:
space:
mode:
authorMichel Etienne2014-11-24 10:53:58 +0100
committerMichel Etienne2014-11-24 10:53:58 +0100
commit47ae076cff0e3cc65f00a266db05fdc4496089cd (patch)
tree045b222d6cc9d0c46e2e672c6a6575ddd4e6c48c /app/controllers
parent8f54c31ac1775b1bc1efcf555750fcdd6fc61639 (diff)
parent4db22a974de47194687560e122372dad4c88a9a5 (diff)
downloadchouette-core-47ae076cff0e3cc65f00a266db05fdc4496089cd.tar.bz2
Merge branch 'V2_5' of github.com:afimb/chouette2 into V2_5
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/exports_controller.rb13
1 files changed, 10 insertions, 3 deletions
diff --git a/app/controllers/exports_controller.rb b/app/controllers/exports_controller.rb
index cb555a3dd..e8c140dd7 100644
--- a/app/controllers/exports_controller.rb
+++ b/app/controllers/exports_controller.rb
@@ -14,9 +14,16 @@ class ExportsController < ChouetteController
end
def create
- create! do |success, failure|
- available_exports
- success.html { flash[:notice] = I18n.t('exports.new.flash')+"<br/>"+I18n.t('exports.new.flash2'); redirect_to referential_exports_path(@referential) }
+ if (params[:export][:type] == "HubExport") && Chouette::VehicleJourneyAtStop.all.count > 50000
+ flash[:notice] = I18n.t("formtastic.titles.export.vjas.size", size: Chouette::VehicleJourneyAtStop.all.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")
+ redirect_to new_referential_export_path(@referential)
+ else
+ create! do |success, failure|
+ success.html { flash[:notice] = I18n.t('exports.new.flash')+"<br/>"+I18n.t('exports.new.flash2'); redirect_to referential_exports_path(@referential) }
+ end
end
end