Add exported file to export

6 files changed, 37 insertions, 21 deletions

diff --git a/app/controllers/exports_controller.rb b/app/controllers/exports_controller.rb
index ae8aa1b75..6d1a20f24 100644
--- a/app/controllers/exports_controller.rb
+++ b/app/controllers/exports_controller.rb
@@ -52,6 +52,15 @@ class ExportsController < ChouetteController
     end
   end
 
+  def references
+    @references = referential.send(params[:type]).where("name ilike ?", "%#{params[:q]}%")
+    respond_to do |format|
+      format.json do
+        render :json => @references.collect { |child| { :id => child.id, :name => child.name } }
+      end
+    end
+  end
+
   protected
   
   def export_service
diff --git a/app/models/export.rb b/app/models/export.rb
index b9cef12e0..f1f62e86f 100644
--- a/app/models/export.rb
+++ b/app/models/export.rb
@@ -40,6 +40,18 @@ class Export
       raise Ievkit::Error("Impossible to access delete or cancel path link for import")
     end
   end
+
+  def file_path
+    links["data"]
+  end
+
+  def filename
+    File.basename(file_path) if file_path
+  end
+
+  def filename_extension
+    File.extname(filename).gsub(".", "") if filename
+  end
   
   def id
     datas.id
@@ -53,14 +65,6 @@ class Export
     datas.format
   end
 
-  def filename
-    datas.links.select{ |link| link["rel"] == "data"}.first.href.gsub( /\/.*\//, "" )
-  end
-  
-  def filename_extension
-    File.extname(filename) if filename
-  end
-  
   def referential_name
     datas.referential
   end
diff --git a/app/models/import.rb b/app/models/import.rb
index ade1f5eb6..ff6faab03 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -49,10 +49,6 @@ class Import
     end
   end
 
-  def file_path
-    links["data"]
-  end
-
   def destroy
     delete_path =  links["delete"]
     cancel_path = links["cancel"]
@@ -66,6 +62,18 @@ class Import
     end
   end
 
+  def file_path
+    links["data"]
+  end
+
+  def filename
+    File.basename(file_path) if file_path
+  end
+
+  def filename_extension
+    File.extname(filename).gsub(".", "") if filename
+  end
+
   def id
     datas.id
   end
@@ -77,14 +85,6 @@ class Import
   def format
     datas.type
   end
-
-  def filename
-    links["data"].gsub( /\/.*\//, "" ) if links["data"]
-  end
-
-  def filename_extension
-    File.extname(filename).gsub(".", "") if filename
-  end
   
   def referential_name
     datas.referential
diff --git a/app/views/exports/_export.erb b/app/views/exports/_export.erb
index ac39466c5..92c17e8c8 100644
--- a/app/views/exports/_export.erb
+++ b/app/views/exports/_export.erb
@@ -17,6 +17,7 @@
     </div>
   </div>
   <div class="panel-body">
+    <p><%= link_to image_tag("icons/file_#{export.filename_extension}.png") + t("exports.show.exported_file"), exported_file_referential_export_path(@referential, export.id) %></p>
   </div>
   <div class="panel-footer">
     <%= progress_bar_tag(export) %>    
diff --git a/config/locales/exports.en.yml b/config/locales/exports.en.yml
index 8e70b9c0b..2a47fba54 100644
--- a/config/locales/exports.en.yml
+++ b/config/locales/exports.en.yml
@@ -12,7 +12,8 @@ en:
       title: "Exports"
       warning: ""
     show:
-      report: "Report"        
+      report: "Report"
+      exported_file: "Exported file"
     statuses:
       started: "Started"      
       scheduled: "Processing ..."
diff --git a/config/locales/exports.fr.yml b/config/locales/exports.fr.yml
index 4e9bf1cd5..daa1ae875 100644
--- a/config/locales/exports.fr.yml
+++ b/config/locales/exports.fr.yml
@@ -13,6 +13,7 @@ fr:
       warning: ""
     show:
       report: "Rapport"
+      exported_file: "Fichier exporté"
       graph:
         files:
           title_zip: "Résultat d'import des fichiers du zip"