X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b7c8b1cc7d646c99493558ab20d3b313eb7b2d9f..855a790d7be3ff345f04226bde3719fb90e6d9a5:/apps/workbench/app/views/application/_title_and_buttons.html.erb?ds=sidebyside

diff --git a/apps/workbench/app/views/application/_title_and_buttons.html.erb b/apps/workbench/app/views/application/_title_and_buttons.html.erb
index 822c904857..31ff2e6e21 100644
--- a/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 @@
   <% 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 @@
              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 @object.owner_uuid == current_user.uuid or (Group.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:",
@@ -44,7 +44,7 @@
              selection_param: 'uuid',
              success: 'redirect-to-created-object'
            }.to_json),
-          { class: "btn btn-sm btn-primary", remote: true, method: 'get',
+          { class: "btn btn-sm btn-primary force-cache-reload", remote: true, method: 'get',
             title: "Move this #{object_class} to a different project"}) do %>
         <i class="fa fa-fw fa-truck"></i> Move <%=object_class%>...
       <% end %>
@@ -53,7 +53,7 @@
 <% end %>
 
 <%
-  # Display any flash messages in an alert. If there is any entry with "error" key, alert-danger is used. 
+  # Display any flash messages in an alert. If there is any entry with "error" key, alert-danger is used.
   flash_msg = ''
   flash_msg_is_error = false
   flash.each do |msg|