Merge branch 'master' into 4036-combine-collections-in-project-issue

[arvados.git] / 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 ee809d60d38dd4bbfe804a3f103e176ab7b69210..e1b08290b04559dae63a1b6091d8d4cdc135ce71 100644 (file)
--- a/apps/workbench/app/views/collections/show.html.erb
+++ b/apps/workbench/app/views/collections/show.html.erb
@@ -3,17 +3,33 @@
     <div class="panel panel-info">
       <div class="panel-heading">
        <h3 class="panel-title">
-         <%= if @object.respond_to? :name
-                render_editable_attribute @object, :name
-              else
-                @name_link.andand.name || @object.uuid
-              end%>
+          <% 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"><%= link_to @object.portable_data_hash, collection_path(@object.portable_data_hash) %></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>