Merge branch 'master' into 5573-user-activity-page-performance

[arvados.git] / 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 383ec64c0ab2697b781660644790f35a0e7a7524..26e71c8d5d32a545f6ccccccaed32af3d98b2087 100644 (file)
--- a/apps/workbench/app/views/collections/_show_files.html.erb
+++ b/apps/workbench/app/views/collections/_show_files.html.erb
@@ -73,17 +73,16 @@ function unselect_all_files() {
          <div class="collection_files_row filterable <%=preview_selectable%>" href="<%=@object.uuid%>/<%=file_path%>">
           <div class="collection_files_buttons pull-right">
             <%= raw(human_readable_bytes_html(size)) %>
-            <% 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", disabled: disable_search}) %>
+                        {title: "View #{file_path}", class: "btn btn-info btn-sm", disabled: !preview_allowed_for(file_path)}) %>
             <%= link_to(raw('<i class="fa fa-download"></i>'),
                         link_params.merge(disposition: 'attachment'),
                         {title: "Download #{file_path}", class: "btn btn-info btn-sm"}) %>
           </div>
 
           <div class="collection_files_name">
-            <% if !defined? no_checkboxes or !no_checkboxes %>
+            <% if (!defined? no_checkboxes or !no_checkboxes) and current_user %>
             <%= check_box_tag 'uuids[]', "#{@object.uuid}/#{file_path}", false, {
                   :class => "persistent-selection",
                   :friendly_type => "File",
@@ -91,6 +90,7 @@ function unselect_all_files() {
                   :href => url_for(controller: 'collections', action: 'show_file',
                                    uuid: @object.portable_data_hash, file: file_path),
                   :title => "Include #{file_path} in your selections",
+                  :id => "#{@object.uuid}_file_#{index}",
                 } %>
             <span>&nbsp;</span>
             <% end %>