[ARVADOS] updated: 123e96939cfdd9bb9a079f5598196e47b74b1f86

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/application_controller.rb      |    2 +-
 apps/workbench/app/models/repository.rb            |    3 +++
 apps/workbench/app/models/virtual_machine.rb       |    1 -
 .../views/application/_arvados_attr_value.html.erb |   13 ++++++++-----
 .../app/views/application/_arvados_object.html.erb |    2 ++
 .../app/views/application/_index.html.erb          |    4 +++-
 sdk/cli/arvados-cli.gemspec                        |    3 ++-
 sdk/cli/bin/arv                                    |    2 +-
 8 files changed, 20 insertions(+), 10 deletions(-)

       via  123e96939cfdd9bb9a079f5598196e47b74b1f86 (commit)
       via  efa22e16995170b1c30cb745b4efbff752591dd6 (commit)
       via  567c0270bc7665e630bf5012e0fd2953fea462ce (commit)
       via  83f85a702927b37236b88ab9633d8e0e918e1218 (commit)
       via  e47f06d00fa65678102594eb6a85b0aba298b33c (commit)
       via  de09cec28729344b8bde815019563082b8e57fb5 (commit)
       via  6696af28df909c0eb45f6cee8e7a3fc1d5658104 (commit)
       via  a999d262ee97000ed313cd4c127e0acf55e98c08 (commit)
      from  030d673e455ac7fa92732eafe95f1db12f6a46b6 (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 123e96939cfdd9bb9a079f5598196e47b74b1f86
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Jan 13 11:17:00 2014 -0500

    Finished improving rendering of UUIDs for now.

diff --git a/apps/workbench/app/views/application/_arvados_attr_value.html.erb b/apps/workbench/app/views/application/_arvados_attr_value.html.erb
index 55f8d08..e04fe45 100644
--- a/apps/workbench/app/views/application/_arvados_attr_value.html.erb
+++ b/apps/workbench/app/views/application/_arvados_attr_value.html.erb
@@ -6,13 +6,16 @@
       <% if obj.attribute_editable?(attr) %>
         <%= render_editable_attribute obj, attr %>
         <% if resource_class_for_uuid(attrvalue, {referring_object: obj, referring_attr: attr}) %>
-	(<%= link_to_if_arvados_object attrvalue, {referring_attr: attr, referring_object: obj, with_class_name: true, friendly_name: true} %>
-        <%= link_to_if_arvados_object(attrvalue, { referring_object: obj, link_text: raw('<span class="icon-hand-right"></span>'), referring_attr: attr })  %>)
+	(<%= link_to_if_arvados_object attrvalue, {referring_attr: attr, referring_object: obj, with_class_name: true, friendly_name: true} %>)
         <% end %>
+      <% elsif attr == 'uuid' %>
+        <%= link_to_if_arvados_object attrvalue, {referring_attr: attr, referring_object: obj, with_class_name: false, friendly_name: false} %>
       <% else %>
         <%= link_to_if_arvados_object attrvalue, {referring_attr: attr, referring_object: obj, with_class_name: true, friendly_name: true} %>
-        <% if resource_class_for_uuid(attrvalue, {referring_object: obj, referring_attr: attr}) %>
-          <%= link_to_if_arvados_object(attrvalue, { referring_object: obj, link_text: raw('<span class="icon-hand-right"></span>'), referring_attr: attr })  %>
-        <% end %>
       <% end %>
+      <!--
+      <% if resource_class_for_uuid(attrvalue, {referring_object: obj, referring_attr: attr}) %>
+        <%= link_to_if_arvados_object(attrvalue, { referring_object: obj, link_text: raw('<span class="icon-hand-right"></span>'), referring_attr: attr })  %>
+      <% end %>
+      -->
 <% end %>
diff --git a/apps/workbench/app/views/application/_arvados_object.html.erb b/apps/workbench/app/views/application/_arvados_object.html.erb
index 95894d1..c41fa18 100644
--- a/apps/workbench/app/views/application/_arvados_object.html.erb
+++ b/apps/workbench/app/views/application/_arvados_object.html.erb
@@ -22,6 +22,7 @@
       <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>
@@ -41,6 +42,7 @@
       <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>
diff --git a/apps/workbench/app/views/application/_index.html.erb b/apps/workbench/app/views/application/_index.html.erb
index d12c401..9d77c49 100644
--- a/apps/workbench/app/views/application/_index.html.erb
+++ b/apps/workbench/app/views/application/_index.html.erb
@@ -1,11 +1,13 @@
 <% if @objects.empty? %>
 
 <p>
-  No <%= controller.model_class.to_s.underscore.pluralize.gsub '_', ' ' %> to display.
+  No <%= controller.model_class.to_s.pluralize.underscore.gsub '_', ' ' %> to display.
 </p>
 
 <% else %>
 
+<h2><%= controller.model_class.to_s.pluralize.underscore.capitalize.gsub '_', ' ' %></h2>
+
 <% attr_blacklist = ' created_at modified_at modified_by_user_uuid modified_by_client_uuid updated_at' %>
 
 <table class="table arv-index">

commit efa22e16995170b1c30cb745b4efbff752591dd6
Merge: 567c027 030d673
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Jan 13 10:17:03 2014 -0500

    Merge commit '030d673e455ac7fa92732eafe95f1db12f6a46b6' into 1862-show-object-links


commit 567c0270bc7665e630bf5012e0fd2953fea462ce
Merge: e52eb49 83f85a7
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Jan 13 10:10:39 2014 -0500

    Merge remote-tracking branch 'origin' into 1862-show-object-links


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


hooks/post-receive
--