Merge branch 'v05' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v05

[pettanr/pettanr.git] / app / views / provider_statuses / import.html.erb

diff --git a/app/views/provider_statuses/import.html.erb b/app/views/provider_statuses/import.html.erb
index 2f38278..dc3fa49 100644 (file)
--- a/app/views/provider_statuses/import.html.erb
+++ b/app/views/provider_statuses/import.html.erb
@@ -1,20 +1,15 @@
 <h1><%= t('.title') %></h1>
 <p id="notice"><%= notice %></p>
 
-<% if @failures == nil %>
-  <h1>No Response</h1>
-<% elsif @failures[:licenses].any? %>
-  <%= render 'licenses_errors', :failures => @failures[:licenses] %>
-<% elsif @failures[:artists].any? %>
-  <%= render 'artists_errors', :failures => @failures[:artists] %>
-<% elsif @failures[:original_pictures][:original_pictures].any? %>
-  <%= render 'original_pictures_errors', :failures => @failures[:original_pictures][:original_pictures] %>
-<% elsif @failures[:original_pictures][:pictures].any? %>
-  <%= render 'pictures_errors', :failures => @failures[:original_pictures][:pictures] %>
-<% elsif @failures[:original_pictures][:resource_pictures].any? %>
-  <%= render 'resource_pictures_errors', :failures => @failures[:original_pictures][:resource_pictures] %>
+<% if @import_result.response? %>
+  <% if @import_result.success? %>
+    <h2>
+      <%= t("provider_statuses.import.success") %>
+    </h2>
+  <% else %>
+    <%= render 'import_errors', :import_result => @import_result %>
+    <%= link_to t("provider_statuses.#{@import_result.action}.to_show"), provider_status_path(@provider_status) %>
+  <% end %>
 <% else %>
-  <h2>
-    <%= t('provider_statuses.import.success') %>
-  </h2>
+  <h1>No Response</h1>
 <% end %>