diff options
| -rw-r--r-- | app/helpers/imports_helper.rb | 11 | ||||
| -rw-r--r-- | app/views/import_tasks/_import_task.erb | 8 | ||||
| -rw-r--r-- | app/views/import_tasks/show.html.erb | 2 |
3 files changed, 16 insertions, 5 deletions
diff --git a/app/helpers/imports_helper.rb b/app/helpers/imports_helper.rb index 2b94cfd1a..22ce8ea98 100644 --- a/app/helpers/imports_helper.rb +++ b/app/helpers/imports_helper.rb @@ -11,4 +11,15 @@ module ImportsHelper end end + def compliance_icon( import_task) + return nil unless import_task.compliance_check_task + import_task.compliance_check_task.tap do |cct| + if cct.failed? || cct.any_error_severity_failure? + return 'icons/link_page_alert.png' + else + return 'icons/link_page.png' + end + end + end + end diff --git a/app/views/import_tasks/_import_task.erb b/app/views/import_tasks/_import_task.erb index e70d0de9b..5f2326209 100644 --- a/app/views/import_tasks/_import_task.erb +++ b/app/views/import_tasks/_import_task.erb @@ -1,5 +1,5 @@ <%= div_for import_task do %> - <div class="icon"> + <div class="icon"> <%= link_to image_tag("import_task-#{import_task.status}.png"), referential_import_task_path(@referential, import_task) %> </div> <div class="resume"> @@ -10,11 +10,11 @@ <div class="links"> <p><%= link_to image_tag("icons/file_#{import_task.file_path_extension}.png") + t("import_tasks.index.imported_file"), file_to_import_referential_import_task_path(@referential, import_task) %></p> <% if import_task.compliance_check_task.present? %> - <p><%= link_to image_tag("icons/link_page.png") + t("import_tasks.compliance_check_task"), referential_compliance_check_task_path(@referential, import_task.compliance_check_task) %></p> - <% end %> + <p><%= link_to image_tag( compliance_icon( import_task)) + t("import_tasks.compliance_check_task"), referential_compliance_check_task_path(@referential, import_task.compliance_check_task) %></p> + <% end %> </div> <div class="history"> <%= l import_task.created_at, :format => "%d/%m/%Y %H:%M" %> | <%= import_task.user_name %> - </div> + </div> </div> <% end %> diff --git a/app/views/import_tasks/show.html.erb b/app/views/import_tasks/show.html.erb index 031d598fc..26b1a5cf2 100644 --- a/app/views/import_tasks/show.html.erb +++ b/app/views/import_tasks/show.html.erb @@ -5,7 +5,7 @@ <div class="links"> <%= link_to image_tag("icons/file_#{@import_task.file_path_extension}.png") + t("import_tasks.show.imported_file"), file_to_import_referential_import_task_path(@import_task.referential, @import_task) %> <% if @import_task.compliance_check_task %> - <%= link_to image_tag('icons/link_page.png') + t("import_tasks.compliance_check_task"), referential_compliance_check_task_path(@import_task.referential, @import_task.compliance_check_task) %> + <%= link_to image_tag( compliance_icon( @import_task) ) + t("import_tasks.compliance_check_task"), referential_compliance_check_task_path(@import_task.referential, @import_task.compliance_check_task) %> <% end %> </div> <%= render( :partial => "results_dashboard") if @import_task.completed? %> |