aboutsummaryrefslogtreecommitdiffstats
path: root/app/views/exports
diff options
context:
space:
mode:
authorLuc Donnet2015-05-12 12:58:08 +0200
committerLuc Donnet2015-05-12 12:58:08 +0200
commit42cda208c4413053c0462aff2eb623b45204be80 (patch)
treefbf0caab44e2ee902964fec3cc9307bd983ab751 /app/views/exports
parent30c12f964f539481ea9e821ec25f2386d142c7d4 (diff)
downloadchouette-core-42cda208c4413053c0462aff2eb623b45204be80.tar.bz2
Fix links and locales for imports and exports Ref #0035502
Diffstat (limited to 'app/views/exports')
-rw-r--r--app/views/exports/_export.erb2
-rw-r--r--app/views/exports/show.html.erb4
2 files changed, 2 insertions, 4 deletions
diff --git a/app/views/exports/_export.erb b/app/views/exports/_export.erb
index 71ab1e0d9..5cf924960 100644
--- a/app/views/exports/_export.erb
+++ b/app/views/exports/_export.erb
@@ -14,7 +14,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) ) if !export.aborted? %></p>
+ <p><%= link_to( image_tag("icons/file_#{export.filename_extension}.png") + t("exports.show.exported_file"), exported_file_referential_export_path(@referential, export.id) ) if export.file_path %></p>
</div>
<div class="panel-footer">
<div class="history">
diff --git a/app/views/exports/show.html.erb b/app/views/exports/show.html.erb
index 28b150e46..7852635aa 100644
--- a/app/views/exports/show.html.erb
+++ b/app/views/exports/show.html.erb
@@ -2,14 +2,12 @@
<%= title_tag job_status_title(@export) %>
</div>
-<% if !@export.aborted? %>
<div class="export_show">
<div class="links">
- <%= link_to( image_tag("icons/file_#{@export.filename_extension}.png") + t("exports.show.exported_file"), exported_file_referential_export_path(@referential, @export.id) ) %>
+ <%= link_to( image_tag("icons/file_#{@export.filename_extension}.png") + t("exports.show.exported_file"), exported_file_referential_export_path(@referential, @export.id) ) if @export.file_path %>
</div>
<%= render( :partial => "shared/ie_report.html", :locals => { :referential => @referential, :job => @export} ) %>
</div>
-<% end %>
<% content_for :sidebar do %>
<ul class="actions">