[ARVADOS] updated: 48956dadd90d0a71a51afdcd9fd3d9a988866272

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/controllers/collections_controller.rb       | 8 ++++++++
 apps/workbench/app/views/collections/_show_recent.html.erb     | 8 ++++----
 apps/workbench/app/views/projects/_show_contents_rows.html.erb | 3 ++-
 3 files changed, 14 insertions(+), 5 deletions(-)

       via  48956dadd90d0a71a51afdcd9fd3d9a988866272 (commit)
      from  5b7762f1e6931c3e4e6ccd36d2a75ce53e38e36c (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 48956dadd90d0a71a51afdcd9fd3d9a988866272
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Aug 21 15:08:38 2014 -0400

    3504: Remove link to links index page on tags.  Add comment to
    CollectionsController#choose.  Adjust column width in collections file table.

diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb
index 1cc4966..010cd22 100644
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -44,6 +44,13 @@ class CollectionsController < ApplicationController
   end
 
   def choose
+    # Find collections using default find_objects logic, then search for name
+    # links, and preload any other links connected to the collections that are
+    # found.
+    # Name links will be obsolete when issue #3036 is merged,
+    # at which point this entire custom #choose function can probably be
+    # eliminated.
+
     params[:limit] ||= 40
 
     find_objects_for_index
@@ -59,6 +66,7 @@ class CollectionsController < ApplicationController
 
     @objects = Collection.
       filter([['uuid','in', at name_links.collect(&:head_uuid)]])
+
     preload_links_for_objects (@collections.to_a + @objects.to_a)
     super
   end
diff --git a/apps/workbench/app/views/collections/_show_recent.html.erb b/apps/workbench/app/views/collections/_show_recent.html.erb
index d963114..54fc9f3 100644
--- a/apps/workbench/app/views/collections/_show_recent.html.erb
+++ b/apps/workbench/app/views/collections/_show_recent.html.erb
@@ -6,11 +6,11 @@
 
 <table id="collections-index" class="topalign table table-condensed table-fixedlayout"> <!-- table-fixed-header-row -->
   <colgroup>
-    <col width="8%" />
     <col width="10%" />
-    <col width="34%" />
-    <col width="11%" />
-    <col width="29%" />
+    <col width="10%" />
+    <col width="40%" />
+    <col width="10%" />
+    <col width="30%" />
   </colgroup>
   <thead>
     <tr class="contain-align-left">
diff --git a/apps/workbench/app/views/projects/_show_contents_rows.html.erb b/apps/workbench/app/views/projects/_show_contents_rows.html.erb
index 638fe14..2afbf3f 100644
--- a/apps/workbench/app/views/projects/_show_contents_rows.html.erb
+++ b/apps/workbench/app/views/projects/_show_contents_rows.html.erb
@@ -32,7 +32,8 @@
     <span class="removable-tag-container">
     <% links_for_object(object).select{|link|link.link_class=='tag'}.each do |tag_link| %>
         <span class="label label-info" data-tag-link-uuid="<%= tag_link.uuid %>">
-          <%= link_to tag_link.name, controller: "links", filters: [["link_class", "=", "tag"], ["name", "=", tag_link.name]].to_json %>
+          <%# FIXME: link tag to search dialog or something # link_to tag_link.name, controller: "links", filters: [["link_class", "=", "tag"], ["name", "=", tag_link.name]].to_json %>
+          <%= tag_link.name %>
           <% if tag_link.owner_uuid == current_user.uuid or current_user.is_admin %>
             <span class="removable-tag">
                <a title="Delete tag"><i class="fa fa-fw fa-trash-o"></i></a>

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


hooks/post-receive
--