[ARVADOS] updated: 852573d60776116bed4e86431667abf8c77d3f9a

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/views/collections/_show_files.html.erb  | 2 +-
 apps/workbench/app/views/collections/_show_recent.html.erb | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

       via  852573d60776116bed4e86431667abf8c77d3f9a (commit)
       via  5faed0c0ad219bd32182ecf5029a363587d4e863 (commit)
      from  e7a9c2edbf0b3843940446077a45ad4c911727ab (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 852573d60776116bed4e86431667abf8c77d3f9a
Author: radhika <radhika at curoverse.com>
Date:   Fri Sep 5 16:00:24 2014 -0400

    3654: combine options is enabled when only data collections are selected in project view.

diff --git a/apps/workbench/app/views/collections/_show_files.html.erb b/apps/workbench/app/views/collections/_show_files.html.erb
index dc43fe2..8dbc9ba 100644
--- a/apps/workbench/app/views/collections/_show_files.html.erb
+++ b/apps/workbench/app/views/collections/_show_files.html.erb
@@ -7,7 +7,7 @@
           <li><%= link_to "Combine selections into a new collection", '/combine_selected',
                   'data-href' => url_for('/combine_selected'),
                   'data-selection-param-name' => 'selection[]',
-                  'data-selection-action' => 'combine',
+                  'data-selection-action' => 'combine-collections',
                   'data-remote' => true,
                   'data-toggle' => 'dropdown'
             %></li>
diff --git a/apps/workbench/app/views/collections/_show_recent.html.erb b/apps/workbench/app/views/collections/_show_recent.html.erb
index 84f37d7..221e0aa 100644
--- a/apps/workbench/app/views/collections/_show_recent.html.erb
+++ b/apps/workbench/app/views/collections/_show_recent.html.erb
@@ -7,7 +7,7 @@
           <li><%= link_to "Combine selections into a new collection", '/combine_selected',
                   'data-href' => url_for('/combine_selected'),
                   'data-selection-param-name' => 'selection[]',
-                  'data-selection-action' => 'combine',
+                  'data-selection-action' => 'combine-collections',
                   'data-remote' => true,
                   'data-toggle' => 'dropdown'
             %></li>

commit 5faed0c0ad219bd32182ecf5029a363587d4e863
Author: radhika <radhika at curoverse.com>
Date:   Fri Sep 5 15:17:40 2014 -0400

    3654: add selection dropdown to collections page

diff --git a/apps/workbench/app/views/collections/_show_recent.html.erb b/apps/workbench/app/views/collections/_show_recent.html.erb
index 15e97c1..84f37d7 100644
--- a/apps/workbench/app/views/collections/_show_recent.html.erb
+++ b/apps/workbench/app/views/collections/_show_recent.html.erb
@@ -23,8 +23,6 @@
 
 <%= form_tag do |f| %>
 
-</div>
-
 <table id="collections-index" class="topalign table table-condensed table-fixedlayout"> <!-- table-fixed-header-row -->
   <colgroup>
     <col width="10%" />
@@ -49,6 +47,8 @@
 
 <% end %>
 
+</div>
+
 <%= render partial: "paging", locals: {results: @collections, object: @object} %>
 
 <% content_for :footer_js do %>

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


hooks/post-receive
--