[ARVADOS] updated: c90d8145634022d2d0c66b36bfb99e4c21248fed

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/assets/javascripts/selection.js            | 4 ----
 apps/workbench/app/views/projects/_show_tab_contents.html.erb | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

       via  c90d8145634022d2d0c66b36bfb99e4c21248fed (commit)
      from  498f3130928f58e830be3abe74b20d06904af3cd (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 c90d8145634022d2d0c66b36bfb99e4c21248fed
Author: radhika <radhika at curoverse.com>
Date:   Thu Sep 4 11:07:44 2014 -0400

    3654: remove "Combine selected collections and files into a new collection" option from clippy.

diff --git a/apps/workbench/app/assets/javascripts/selection.js b/apps/workbench/app/assets/javascripts/selection.js
index fe62700..cf31fd7 100644
--- a/apps/workbench/app/assets/javascripts/selection.js
+++ b/apps/workbench/app/assets/javascripts/selection.js
@@ -57,10 +57,6 @@ jQuery(function($){
         $("#persistent-selection-count").text(lst.length);
         if (lst.length > 0) {
             html = '<li><a href="#" class="btn btn-xs btn-info" id="clear_selections_button"><i class="fa fa-fw fa-ban"></i> Clear selections</a></li>';
-            html += '<li><button class="btn btn-xs btn-info" type="submit" name="combine_selected_files_into_collection" '
-                + ' id="combine_selected_files_into_collection">'
-                + '<i class="fa fa-fw fa-archive"></i> Combine selected collections and files into a new collection</button></li>'
-                + '<li class="notification"><table style="width: 100%"></table></li>';
             $('#selection-form-content').html(html);
 
             for (var i = 0; i < lst.length; i++) {
diff --git a/apps/workbench/app/views/projects/_show_tab_contents.html.erb b/apps/workbench/app/views/projects/_show_tab_contents.html.erb
index a46f535..2789542 100644
--- a/apps/workbench/app/views/projects/_show_tab_contents.html.erb
+++ b/apps/workbench/app/views/projects/_show_tab_contents.html.erb
@@ -5,7 +5,7 @@
         <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Selection... <span class="caret"></span></button>
         <ul class="dropdown-menu" role="menu">
           <li><%= link_to "Combine selections into a new collection", '/combine_selected',
-                  'data-href' => url_for('/combine_selected'),
+                  'data-href' => url_for('/combine_selected?show_project=true'),
                   'data-selection-param-name' => 'selection[]',
                   'data-selection-action' => 'combine',
                   'data-remote' => true,

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


hooks/post-receive
--