X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a9619cd9d563b5c434da6a11566517cacb410124..fe8657ef0f8698837e9bdb5e9c1bf26a068efba9:/apps/workbench/app/views/collections/_show_files.html.erb

diff --git a/apps/workbench/app/views/collections/_show_files.html.erb b/apps/workbench/app/views/collections/_show_files.html.erb
index 020f16dd5a..051fbf4f62 100644
--- a/apps/workbench/app/views/collections/_show_files.html.erb
+++ b/apps/workbench/app/views/collections/_show_files.html.erb
@@ -5,8 +5,10 @@
       <div class="btn-group btn-group-sm">
         <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 selected files into a new collection", '#',
-                  'data-href' => combine_selected_path,
+          <li><%= link_to "Create new collection with selected files", '#',
+                  'data-href' => combine_selected_path(
+                    action_data: {current_project_uuid: @object.owner_uuid}.to_json
+                  ),
                   'data-selection-param-name' => 'selection[]',
                   'data-selection-action' => 'combine-collections',
                   'method' => 'post',
@@ -43,12 +45,10 @@
        <div class="collection_files_row">
         <div class="collection_files_buttons pull-right">
           <%= raw(human_readable_bytes_html(size)) %>
-          <% if Rails.configuration.filename_suffixes_with_view_icon.include? file_path.split('.')[-1] %>
+          <% disable_search = (Rails.configuration.filename_suffixes_with_view_icon.include? file_path.split('.')[-1]) ? false : true %>
           <%= link_to(raw('<i class="fa fa-search"></i>'),
                       link_params.merge(disposition: 'inline'),
-                      {title: "View #{file_path}", class: "btn btn-info btn-sm"}) %>
-          <% end %>
-
+                      {title: "View #{file_path}", class: "btn btn-info btn-sm", disabled: disable_search}) %>
           <%= link_to(raw('<i class="fa fa-download"></i>'),
                       link_params.merge(disposition: 'attachment'),
                       {title: "Download #{file_path}", class: "btn btn-info btn-sm"}) %>
@@ -64,6 +64,7 @@
                                  uuid: @object.portable_data_hash, file: file_path),
                 :title => "Include #{file_path} in your selections",
               } %>
+          <span>&nbsp;</span>
           <% end %>
       <% if CollectionsHelper::is_image(filename) %>
           <i class="fa fa-fw fa-bar-chart-o"></i> <%= filename %></div>