From d7ea1fb7c9c47ee7c92bc3fc880fc88ec9cd34b4 Mon Sep 17 00:00:00 2001
From: Zakaria BOUZIANE
Date: Tue, 7 Apr 2015 14:48:31 +0200
Subject: Fix Import model methods

---
 app/models/import.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'app/models')

diff --git a/app/models/import.rb b/app/models/import.rb
index 0ba245d42..905544a1e 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -61,11 +61,11 @@ class Import
   end
 
   def format
-    datas.format
+    datas.type
   end
 
   def filename
-    datas.filename
+    datas.links.select{ |link| link["rel"] == "data"}.first.href.gsub( /\/.*\//, "" )
   end
 
   def filename_extension
@@ -98,10 +98,6 @@ class Import
     datas.action_parameters.no_save
   end
 
-  def filename
-    datas.filename
-  end
-
   def created_at?
     datas.created?
   end
-- 
cgit v1.2.3