X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/36c360770c7925509552cfe8c3d8bf64fe1c2644..fe8657ef0f8698837e9bdb5e9c1bf26a068efba9:/apps/workbench/app/views/collections/show.html.erb

diff --git a/apps/workbench/app/views/collections/show.html.erb b/apps/workbench/app/views/collections/show.html.erb
index f049de9ef0..e1b08290b0 100644
--- a/apps/workbench/app/views/collections/show.html.erb
+++ b/apps/workbench/app/views/collections/show.html.erb
@@ -1,38 +1,35 @@
-<div class="dropdown">
-  <button class="btn btn-default dropdown-toggle" id="copy2project-btn" type="button" data-toggle="dropdown">
-    Copy this collection to project...
-    <span class="caret"></span>
-  </button>
-  <ul class="dropdown-menu" role="menu" aria-labelledby="copy2project-btn">
-    <%= render partial: "projects_tree_menu", locals: {
-          :project_link_to => Proc.new do |pnode, &block|
-            link_to( actions_path(id: pnode[:object].uuid,
-                                  selection: [ @object.uuid ],
-                                  selection_param: 'selection[]',
-                                  copy_selections_into_project: pnode[:object].uuid,
-                                  success: 'redirect-to-created-object'),
-                      method: :post,
-                      &block)
-          end,
-          :top_button => nil
-         } %>
-  </ul>
-</div>
-
-
 <div class="row row-fill-height">
   <div class="col-md-6">
     <div class="panel panel-info">
       <div class="panel-heading">
 	<h3 class="panel-title">
-	  <%= @name_link.andand.name || @object.uuid %>
+          <% if @name_link.nil? and @object.uuid.match /[0-9a-f]{32}/ %>
+            Content hash <%= @object.portable_data_hash %>
+          <% else %>
+	    <%= if @object.respond_to? :name
+                  render_editable_attribute @object, :name
+                else
+                  @name_link.andand.name || @object.uuid
+                end %>
+            <% end %>
 	</h3>
       </div>
       <div class="panel-body">
+        <div class="arv-description-as-subtitle">
+          <%= render_editable_attribute @object, 'description', nil, { 'data-emptytext' => "(No description provided)", 'data-toggle' => 'manual' } %>
+        </div>
         <img src="/favicon.ico" class="pull-right" alt="" style="opacity: 0.3"/>
-	<p><i>Content hash:</i><br />
-	  <span class="arvados-uuid"><%= @object.uuid %></span></p>
-
+        <% if defined? @same_pdh %>
+          <p>Found in collections:<p>
+          <p>
+            <% @same_pdh.each do |c| %>
+              <%= link_to_if_arvados_object get_object(c.owner_uuid), {:friendly_name => true} %> / <%= link_to_if_arvados_object c, {:friendly_name => true} %><br>
+            <% end %>
+          </p>
+        <% else %>
+	  <p><i>Content hash:</i><br />
+	    <span class="arvados-uuid"><%= link_to @object.portable_data_hash, collection_path(@object.portable_data_hash) %></span></p>
+        <% end %>
         <%= render partial: "show_source_summary" %>
       </div>
     </div>
@@ -52,10 +49,10 @@
         <% name_or_object = @name_link.andand.uuid ? @name_link : @object %>
         <% if name_or_object.created_at and not @logs.andand.any? %>
           <p>
-            Created: <%= name_or_object.created_at.to_s(:long) %>
+            Created: <%= name_or_object.created_at.to_s(:long) if name_or_object.created_at %>
           </p>
           <p>
-            Last modified: <%= name_or_object.modified_at.to_s(:long) %> by <%= link_to_if_arvados_object name_or_object.modified_by_user_uuid, friendly_name: true %>
+            Last modified: <%= name_or_object.modified_at.to_s(:long) if name_or_object.modified_at %> by <%= link_to_if_arvados_object name_or_object.modified_by_user_uuid, friendly_name: true %>
           </p>
         <% else %>
           <%= render_arvados_object_list_start(@logs, 'Show all activity',
@@ -112,4 +109,4 @@
   </div>
 </div>
 
-<%= render file: 'application/show.html.erb' %>
+<%= render file: 'application/show.html.erb', locals: local_assigns %>