Add exported file to export

2 files changed, 24 insertions, 20 deletions

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