X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4dc0af33b57ffe9f55f43ce1df69fd05f36b3995..4c8ec1b2166a81b05b2b6cf5a6fae5b839876802:/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 9a7b1b4f84..a0ae2d3036 100644
--- 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,10 +27,12 @@
 	  { 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(