Merge branch '3605-node-info-field' refs #3605

[arvados.git] / apps / workbench / app / views / projects / show.html.erb

diff --git a/apps/workbench/app/views/projects/show.html.erb b/apps/workbench/app/views/projects/show.html.erb
index c221ca1d161c50c87ea5085278d83263d05e3eac..a0ae2d3036ccd69a5ee14a4ee86e55f8179504b6 100644 (file)
--- a/apps/workbench/app/views/projects/show.html.erb
+++ b/apps/workbench/app/views/projects/show.html.erb
@@ -1,14 +1,6 @@
 <% if @object.uuid != current_user.uuid # Not the "Home" project %>
 <% content_for :content_top do %>
-
-<h2>
-  <%= render_editable_attribute @object, 'name', nil, { 'data-emptytext' => "New project" } %>
-</h2>
-
-<div class="arv-description-as-subtitle">
-  <%= render_editable_attribute @object, 'description', nil, { 'data-emptytext' => "(No description provided)", 'data-toggle' => 'manual' } %>
-</div>
-
+  <%= render partial: 'name_and_description' %>
 <% end %>
 <% end %>
 
@@ -35,16 +27,17 @@
          { class: "btn btn-primary btn-sm", remote: true, method: 'get' }) do %>
       <i class="fa fa-fw fa-gear"></i> Run a pipeline...
     <% end %>
-    <%= link_to projects_path('project[owner_uuid]' => @object.uuid), method: 'post', class: 'btn btn-sm btn-primary' do %>
+    <%= link_to projects_path({'project[owner_uuid]' => @object.uuid, 'options' => {'ensure_unique_name' => true}}), method: 'post', class: 'btn btn-sm btn-primary' do %>
       <i class="fa fa-fw fa-plus"></i>
       Add a subproject
     <% end %>
+  <% end %>
+  <% if @object.owner_uuid == current_user.uuid or (Group.find(@object.owner_uuid).writable_by.include?(current_user.uuid) rescue nil) %>
     <% if @object.uuid != current_user.uuid # Not the "Home" project %>
       <%= link_to(
           choose_projects_path(
            title: 'Move this project to...',
            editable: true,
-           my_root_selectable: true,
            action_name: 'Move',
            action_href: project_path(@object.uuid),
            action_method: 'put',