[ARVADOS] created: e52eb49c5e240f6adecf0242cd967a1ae6991291

[git at public.curoverse.com]

        at  e52eb49c5e240f6adecf0242cd967a1ae6991291 (commit)


commit e52eb49c5e240f6adecf0242cd967a1ae6991291
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Jan 10 19:09:18 2014 -0500

    Improving link names

diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index c67b314..fe35bfe 100644
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -32,8 +32,15 @@ module ApplicationHelper
       link_name = opts[:link_text]
       if !link_name
         link_name = link_uuid
-        if opts[:with_class_name]
-          link_name = "#{resource_class.to_s} #{link_name}"
+        opts[:friendly_name]
+        if opts[:friendly_name] and resource_class.column_names.include? "name"
+          link_name = resource_class.find(link_uuid).name
+        elsif opts[:friendly_name] and resource_class.column_names.include? "first_name"
+          link_name = "#{resource_class.find(link_uuid).first_name} #{resource_class.find(link_uuid).last_name}"
+        else
+          if opts[:with_class_name]
+            link_name = "#{resource_class.to_s} #{link_name}"
+          end
         end
       end
       link_to link_name, { controller: resource_class.to_s.underscore.pluralize, action: 'show', id: link_uuid }, style_opts
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 4dc6daa..0fb0181 100644
--- a/apps/workbench/app/views/application/_arvados_attr_value.html.erb
+++ b/apps/workbench/app/views/application/_arvados_attr_value.html.erb
@@ -5,10 +5,10 @@
 <% else %>
     <% if attr == 'uuid' and (uuid = attrvalue.split('-')).size == 3 %>
       <%= uuid[0..-2].join('-') %>-<b><%= uuid[-1] %></b>
-    <% elsif obj.attribute_editable?(attr) %>
+    <% elsif allow_edit && obj.attribute_editable?(attr) %>
       <%= render_editable_attribute obj, attr %>
     <% else %>
-      <%= link_to_if_arvados_object attrvalue, {referring_attr: attr, referring_object: obj, with_class_name: true} %>
+      <%= link_to_if_arvados_object attrvalue, {referring_attr: attr, referring_object: obj, with_class_name: true, friendly_name: true} %>
     <% 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 })  %>
diff --git a/apps/workbench/app/views/application/_arvados_object.html.erb b/apps/workbench/app/views/application/_arvados_object.html.erb
index c41fa18..8e0350a 100644
--- a/apps/workbench/app/views/application/_arvados_object.html.erb
+++ b/apps/workbench/app/views/application/_arvados_object.html.erb
@@ -20,11 +20,11 @@
   <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>
+        <td><%= render partial: 'application/arvados_attr_value', locals: { obj: link, attr: "uuid", attrvalue: link.uuid, allow_edit: false } %></td>
+        <td><%= render partial: 'application/arvados_attr_value', locals: { obj: link, attr: "link_class", attrvalue: link.link_class, allow_edit: false } %></td>
+        <td><%= render partial: 'application/arvados_attr_value', locals: { obj: link, attr: "name", attrvalue: link.name, allow_edit: false } %></td>
+        <td><%= render partial: 'application/arvados_attr_value', locals: { obj: link, attr: "head_uuid", attrvalue: link.head_uuid, allow_edit: false } %></td>
+        <td><%= render partial: 'application/arvados_attr_value', locals: { obj: link, attr: "properties", attrvalue: link.properties, allow_edit: false } %></td>
       </tr>
     <% end %>
   </tbody>
@@ -40,11 +40,11 @@
   <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>
+        <td><%= render partial: 'application/arvados_attr_value', locals: { obj: link, attr: "uuid", attrvalue: link.uuid, allow_edit: false } %></td>
+        <td><%= render partial: 'application/arvados_attr_value', locals: { obj: link, attr: "link_class", attrvalue: link.link_class, allow_edit: false } %></td>
+        <td><%= render partial: 'application/arvados_attr_value', locals: { obj: link, attr: "name", attrvalue: link.name, allow_edit: false } %></td>
+        <td><%= render partial: 'application/arvados_attr_value', locals: { obj: link, attr: "tail_uuid", attrvalue: link.tail_uuid, allow_edit: false } %></td>
+        <td><%= render partial: 'application/arvados_attr_value', locals: { obj: link, attr: "properties", attrvalue: link.properties, allow_edit: false } %></td>
       </tr>
     <% end %>
   </tbody>
diff --git a/apps/workbench/app/views/application/_arvados_object_attr.html.erb b/apps/workbench/app/views/application/_arvados_object_attr.html.erb
index ec2ac36..90c8a61 100644
--- a/apps/workbench/app/views/application/_arvados_object_attr.html.erb
+++ b/apps/workbench/app/views/application/_arvados_object_attr.html.erb
@@ -2,7 +2,7 @@
 <tr class="info">
   <td><%= attr %>[<%= infokey %>]</td>
   <td>
-    <%= render partial: 'application/arvados_attr_value', locals: { obj: @object, attr: nil, attrvalue: infocontent } %>
+    <%= render partial: 'application/arvados_attr_value', locals: { obj: @object, attr: nil, attrvalue: infocontent, allow_edit: false } %>
   </td>
 </tr>
 <% end %>
@@ -10,7 +10,7 @@
 <tr class="<%= 'info' if %w(uuid owner_uuid created_at modified_at modified_by_user_uuid modified_by_client_uuid updated_at).index(attr.to_s).nil? %>">
   <td><%= attr %></td>
   <td>
-    <%= render partial: 'application/arvados_attr_value', locals: { obj: @object, attr: attr, attrvalue: attrvalue } %>
+    <%= render partial: 'application/arvados_attr_value', locals: { obj: @object, attr: attr, attrvalue: attrvalue, allow_edit: true } %>
   </td>
 </tr>
 <% end %>

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


hooks/post-receive
--