Merge branch 'master' into 4232-slow-pipes-n-jobs

diff --combined apps/workbench/app/views/application/_title_and_buttons.html.erb
index 887529b10d5c35e435608f33f1ae61631afc0209,f79419247321fba8aeff4f28577536613fa3833e..31ff2e6e21a6e659ad8f75d14d2630e020b4d62b
--- 1/apps/workbench/app/views/application/_title_and_buttons.html.erb
--- 2/apps/workbench/app/views/application/_title_and_buttons.html.erb
+++ b/apps/workbench/app/views/application/_title_and_buttons.html.erb
@@@ -11,9 -11,9 +11,9 @@@
    <% end %>
  <% end %>
  
- <% if @object.class.goes_in_projects? && @object.uuid != current_user.uuid # Not the "Home" project %>
+ <% if @object.class.goes_in_projects? && @object.uuid != current_user.andand.uuid # Not the "Home" project %>
    <% content_for :tab_line_buttons do %>
-     <% if @object.class.copies_to_projects? %>
+     <% if current_user.andand.is_active && @object.class.copies_to_projects? %>
        <%= link_to(
            choose_projects_path(
             title: "Copy this #{object_class} to:",
@@@ -27,11 -27,11 +27,11 @@@
               success: 'redirect-to-created-object'
             }.to_json),
            { class: "btn btn-sm btn-primary", remote: true, method: 'get',
 -            title: "Make a copy this #{object_class}" }) do %>
 +            title: "Make a copy of this #{object_class}" }) do %>
          <i class="fa fa-fw fa-copy"></i> Copy to project...
        <% end %>
      <% end %>
-     <% if (ArvadosBase.find(@object.owner_uuid).writable_by.include?(current_user.uuid) rescue nil) %>
+     <% if (ArvadosBase.find(@object.owner_uuid).writable_by.include?(current_user.andand.uuid) rescue nil) %>
        <%= link_to(
            choose_projects_path(
             title: "Move this #{object_class} to:",

diff --combined apps/workbench/app/views/pipeline_instances/_running_component.html.erb
index dc9f00de162de44d872a57c109789bf897bcb967,f87dede2a6e5386f8d98251df5800982cd6e2acd..4359860c6e5529c487dd8b4a672e9058e31e1cef
--- 1/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
--- 2/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
@@@ -39,7 -39,7 +39,7 @@@
            <% if current_job[:state] == "Queued" %>
              <%# column offset 5 %>
              <div class="col-md-6">
 -              <% queuetime = Time.now - current_job[:created_at] %>
 +              <% queuetime = Time.now - Time.iso8601(current_job[:created_at]) %>
                Queued for <%= render_runtime(queuetime, true) %>.
                <% begin %>
                  <% if current_job[:queue_position] == 0 %>
@@@ -75,7 -75,7 +75,7 @@@
              </div>
            <% end %>
  
-           <% if current_job[:state].in? ["Queued", "Running"] %>
+           <% if current_job[:state].in? ["Queued", "Running"] and @object.editable? %>
              <%# column offset 11 %>
              <div class="col-md-1 pipeline-instance-spacing">
                <%= form_tag "/jobs/#{current_job[:uuid]}/cancel", remote: true, style: "display:inline; padding-left: 1em" do |f| %>