[ARVADOS] updated: 0638ff8a5693ec809362225b46b8f579f6edea30

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/application_controller.rb      |    2 +-
 .../app/views/application/_arvados_object.html.erb |   50 --------------------
 ...rvados_object.html.erb => _show_links.html.erb} |   22 ---------
 3 files changed, 1 insertions(+), 73 deletions(-)
 copy apps/workbench/app/views/application/{_arvados_object.html.erb => _show_links.html.erb} (79%)

       via  0638ff8a5693ec809362225b46b8f579f6edea30 (commit)
      from  037fd10ba7643413c99892100cb4356669acebb1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 0638ff8a5693ec809362225b46b8f579f6edea30
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Feb 4 12:21:29 2014 -0800

    Move links section of *.show out of Attributes into a Links tab
    
    refs #1979

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 2985249..d4df840 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -64,7 +64,7 @@ class ApplicationController < ActionController::Base
   end
 
   def show_pane_list
-    %w(Attributes About API_response curl_example CLI_example Python_example)
+    %w(Attributes Links About API_response curl_example CLI_example Python_example)
   end
   def show
     if !@object
diff --git a/apps/workbench/app/views/application/_arvados_object.html.erb b/apps/workbench/app/views/application/_arvados_object.html.erb
index 13187fd..5e7d56c 100644
--- a/apps/workbench/app/views/application/_arvados_object.html.erb
+++ b/apps/workbench/app/views/application/_arvados_object.html.erb
@@ -1,5 +1,3 @@
-<% content_for :arvados_object_table do %>
-
 <%= form_for @object do |f| %>
 <table class="table topalign">
   <thead>
@@ -10,52 +8,4 @@
     <% end %>
   </tbody>
 </table>
-
-<% incoming = Link.where(tail_uuid: @object.uuid) %>
-<% if incoming.items_available > 0 %>
-<h3>Incoming Links</h3>
-<table class="table topalign">
-  <thead>
-  </thead>
-  <tbody>
-    <% incoming.each do |link| %>
-      <tr>
-        <td><%= render partial: 'application/arvados_attr_value', locals: { obj: link, attr: "uuid", attrvalue: link.uuid } %></td>
-        <td><%= render partial: 'application/arvados_attr_value', locals: { obj: link, attr: "link_class", attrvalue: link.link_class } %></td>
-        <td><%= render partial: 'application/arvados_attr_value', locals: { obj: link, attr: "name", attrvalue: link.name } %></td>
-        <td><%= render partial: 'application/arvados_attr_value', locals: { obj: link, attr: "head_uuid", attrvalue: link.head_uuid } %></td>
-        <td><%= render partial: 'application/arvados_attr_value', locals: { obj: link, attr: "properties", attrvalue: link.properties } %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-<% end %>
-
-<% outgoing = Link.where(head_uuid: @object.uuid) %>
-<% if outgoing.items_available > 0 %>
-<h3>Outgoing Links</h3>
-<table class="table topalign">
-  <thead>
-  </thead>
-  <tbody>
-    <% outgoing.each do |link| %>
-      <tr>
-        <td><%= render partial: 'application/arvados_attr_value', locals: { obj: link, attr: "uuid", attrvalue: link.uuid } %></td>
-        <td><%= render partial: 'application/arvados_attr_value', locals: { obj: link, attr: "link_class", attrvalue: link.link_class } %></td>
-        <td><%= render partial: 'application/arvados_attr_value', locals: { obj: link, attr: "name", attrvalue: link.name } %></td>
-        <td><%= render partial: 'application/arvados_attr_value', locals: { obj: link, attr: "tail_uuid", attrvalue: link.tail_uuid } %></td>
-        <td><%= render partial: 'application/arvados_attr_value', locals: { obj: link, attr: "properties", attrvalue: link.properties } %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-<% end %>
-
-<% end %>
-<% end %>
-
-<% if content_for? :page_content %>
-<%= yield :page_content %>
-<% else %>
-<%= yield :arvados_object_table %>
 <% end %>
diff --git a/apps/workbench/app/views/application/_arvados_object.html.erb b/apps/workbench/app/views/application/_show_links.html.erb
similarity index 79%
copy from apps/workbench/app/views/application/_arvados_object.html.erb
copy to apps/workbench/app/views/application/_show_links.html.erb
index 13187fd..36a209c 100644
--- a/apps/workbench/app/views/application/_arvados_object.html.erb
+++ b/apps/workbench/app/views/application/_show_links.html.erb
@@ -1,16 +1,3 @@
-<% content_for :arvados_object_table do %>
-
-<%= form_for @object do |f| %>
-<table class="table topalign">
-  <thead>
-  </thead>
-  <tbody>
-    <% @object.attributes_for_display.each do |attr, attrvalue| %>
-    <%= render partial: 'application/arvados_object_attr', locals: { attr: attr, attrvalue: attrvalue } %>
-    <% end %>
-  </tbody>
-</table>
-
 <% incoming = Link.where(tail_uuid: @object.uuid) %>
 <% if incoming.items_available > 0 %>
 <h3>Incoming Links</h3>
@@ -50,12 +37,3 @@
   </tbody>
 </table>
 <% end %>
-
-<% end %>
-<% end %>
-
-<% if content_for? :page_content %>
-<%= yield :page_content %>
-<% else %>
-<%= yield :arvados_object_table %>
-<% end %>

-----------------------------------------------------------------------


hooks/post-receive
--