diff options
| -rw-r--r-- | app/models/compliance_check_task.rb | 4 | ||||
| -rw-r--r-- | app/models/import_task.rb | 4 | ||||
| -rw-r--r-- | app/views/import_tasks/_import_task.erb | 4 | ||||
| -rw-r--r-- | app/views/import_tasks/show.html.erb | 5 |
4 files changed, 13 insertions, 4 deletions
diff --git a/app/models/compliance_check_task.rb b/app/models/compliance_check_task.rb index 2c1fb1bc5..80fbad38f 100644 --- a/app/models/compliance_check_task.rb +++ b/app/models/compliance_check_task.rb @@ -21,6 +21,10 @@ class ComplianceCheckTask < ActiveRecord::Base compliance_check_results.any? { |r| r.error_severity_failure? } end + def failed? + status == "failed" + end + def chouette_command Chouette::Command.new(:schema => referential.slug) end diff --git a/app/models/import_task.rb b/app/models/import_task.rb index 6aca85821..90783075d 100644 --- a/app/models/import_task.rb +++ b/app/models/import_task.rb @@ -45,6 +45,10 @@ class ImportTask < ActiveRecord::Base delay.import end + def save_requested? + !parameter_set["no_save"] + end + protected option :no_save, :boolean diff --git a/app/views/import_tasks/_import_task.erb b/app/views/import_tasks/_import_task.erb index afa235d4d..e70d0de9b 100644 --- a/app/views/import_tasks/_import_task.erb +++ b/app/views/import_tasks/_import_task.erb @@ -4,13 +4,13 @@ </div> <div class="resume"> <ul class="header clearfix"> - <li class="title"><%= link_to(import_task.name, referential_import_task_path(@referential, import_task)) %></li> + <li class="title"><% if import_task.save_requested? %><i class="fa fa-save"></i><% end %> <%= link_to(import_task.name, referential_import_task_path(@referential, import_task)) %></li> <li class="remove"><%= link_to "<i class='fa fa-trash-o'></i>".html_safe, referential_import_task_path(@referential, import_task), :method => :delete, :class => "delete", :data => {:confirm => t('import_tasks.actions.destroy_confirm')} %></li> </ul> <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> + <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 %> </div> <div class="history"> diff --git a/app/views/import_tasks/show.html.erb b/app/views/import_tasks/show.html.erb index 720d21c79..031d598fc 100644 --- a/app/views/import_tasks/show.html.erb +++ b/app/views/import_tasks/show.html.erb @@ -1,10 +1,11 @@ -<%= title_tag "#{@import_task.full_name} <span class='status status_#{@import_task.status}'>#{ t('import_tasks.show.'+@import_task.status) }</span>" %> +<% title = @import_task.save_requested? ? "<i class='fa fa-save'></i>" : "" %> +<%= title_tag "#{title} #{@import_task.name} <span class='status status_#{@import_task.status}'>#{ t('import_tasks.show.'+@import_task.status) }</span>" %> <div class="import_task_show"> <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), :class => "#{button_link_class(@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) %> <% end %> </div> <%= render( :partial => "results_dashboard") if @import_task.completed? %> |