X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3979c83819a07b544aa4a0510bbeb58d1c92905a..b92203411f6f6adaef1c2af62495830f13f4fa14:/apps/workbench/app/views/pipeline_instances/_running_component.html.erb?ds=sidebyside diff --git a/apps/workbench/app/views/pipeline_instances/_running_component.html.erb b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb index 018d49f5e4..63075f7e66 100644 --- a/apps/workbench/app/views/pipeline_instances/_running_component.html.erb +++ b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb @@ -25,7 +25,8 @@ <% walltime = ((if current_job[:finished_at] then current_job[:finished_at] else Time.now() end) - current_job[:started_at]) %> <% cputime = tasks.map { |task| if task.started_at and task.job_uuid == current_job[:uuid] - (if task.finished_at then task.finished_at else Time.now() end) - task.started_at + finished_at = task.finished_at || current_job[:finished_at] || Time.now() + finished_at - task.started_at else 0 end @@ -66,9 +67,9 @@ <%# column offset 8 %>
@@ -104,6 +114,12 @@ | <% if current_component[k].nil? %> (none) + <% elsif repo and k == :repository %> + <%= link_to current_component[k], show_repository_tree_path(id: repo.uuid, commit: current_component[:script_version], path: '/') %> + <% elsif repo and k == :script %> + <%= link_to current_component[k], show_repository_blob_path(id: repo.uuid, commit: current_component[:script_version], path: 'crunch_scripts/'+current_component[:script]) %> + <% elsif repo and k == :script_version %> + <%= link_to current_component[k], show_repository_commit_path(id: repo.uuid, commit: current_component[:script_version]) %> <% else %> <%= current_component[k] %> <% end %> @@ -124,7 +140,8 @@ docker_image_locator: | - <%= link_to_if_arvados_object current_component[:docker_image_locator], friendly_name: true %> + <%= link_to_arvados_object_if_readable(current_component[:docker_image_locator], + current_component[:docker_image_locator], friendly_name: true) %> | <% if k == :uuid %> - <%= link_to_if_arvados_object current_component[k], link_text: current_component[k] %> + <%= link_to_arvados_object_if_readable(current_component[k], current_component[k], link_text: current_component[k]) %> <% elsif k.to_s.end_with? 'uuid' %> - <%= link_to_if_arvados_object current_component[k], friendly_name: true %> + <%= link_to_arvados_object_if_readable(current_component[k], current_component[k], friendly_name: true) %> <% elsif k.to_s.end_with? '_at' %> <%= render_localized_date(current_component[k]) %> <% else %> |