aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZakaria BOUZIANE2015-04-07 14:48:31 +0200
committerZakaria BOUZIANE2015-04-07 14:48:31 +0200
commitd7ea1fb7c9c47ee7c92bc3fc880fc88ec9cd34b4 (patch)
tree33e2639a5985305916584a00524ffb44df708fae
parentfbf56468ba651a8022cd7db1fc75906702bd0b93 (diff)
downloadchouette-core-d7ea1fb7c9c47ee7c92bc3fc880fc88ec9cd34b4.tar.bz2
Fix Import model methods
-rw-r--r--app/models/import.rb8
1 files changed, 2 insertions, 6 deletions
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