Update export views

2 files changed, 9 insertions, 33 deletions

diff --git a/app/controllers/exports_controller.rb b/app/controllers/exports_controller.rb
index 0fb66294d..ae8aa1b75 100644
--- a/app/controllers/exports_controller.rb
+++ b/app/controllers/exports_controller.rb
@@ -1,15 +1,13 @@
 require 'will_paginate/array'
+require 'open-uri'
 
 class ExportsController < ChouetteController
   defaults :resource_class => Export
   
-  respond_to :xml, :json
-  respond_to :html, :only => [:show, :index, :new, :create, :delete]
+  respond_to :html, :only => [:show, :index, :destroy, :exported_file]
   respond_to :js, :only => [:show, :index]
   belongs_to :referential
 
-  #curl -F "file=@corolis.zip;filename=corolis_gtfs.zip" -F "file=@parameters.json;filename=parameters.json" http://localhost:8080/chouette_iev/referentials/corolis/exporter/gtfs
-  
   def index
     begin
       index! do 
@@ -33,37 +31,20 @@ class ExportsController < ChouetteController
       redirect_to referential_path(@referential)
     end
   end
-  
-  def new
-    begin
-      new! do 
-        puts "OK"
-      end
-    rescue Ievkit::Error => error
-      logger.error("Iev failure : #{error.message}")
-      flash[:error] = t('iev.failure')
-      redirect_to referential_path(@referential)
-    end
-  end
-  
-  def create
+
+  def destroy    
     begin
-      create! do 
-        puts "OK"
-      end
+      destroy!
     rescue Ievkit::Error => error
       logger.error("Iev failure : #{error.message}")
       flash[:error] = t('iev.failure')
       redirect_to referential_path(@referential)
     end
   end
-  
-  def delete
+
+  def exported_file
     begin
-      delete! do
-        export_service.delete(@export.id)
-        redirect_to referential_exports_path(@referential)      
-      end
+      send_file open(resource.file_path), { :type => "application/#{resource.filename_extension}", :disposition => "attachment", :filename => resource.filename }
     rescue Ievkit::Error => error
       logger.error("Iev failure : #{error.message}")
       flash[:error] = t('iev.failure')
@@ -76,10 +57,6 @@ class ExportsController < ChouetteController
   def export_service
     ExportService.new(@referential)
   end
-
-  def build_resource(attributes = {})
-    @export ||= ExportTask.new
-  end
   
   def resource
     @export ||= export_service.find( params[:id] )
diff --git a/app/controllers/imports_controller.rb b/app/controllers/imports_controller.rb
index e09fdfec5..a8a1636c7 100644
--- a/app/controllers/imports_controller.rb
+++ b/app/controllers/imports_controller.rb
@@ -34,8 +34,7 @@ class ImportsController < ChouetteController
 
   def destroy
     begin
-      destroy! do 
-      end
+      destroy!
     rescue Ievkit::Error => error
       logger.error("Iev failure : #{error.message}")
       flash[:error] = t('iev.failure')