diff --git a/BrainPortal/cbrain_plugins/cbrain-plugins-base/cbrain_task/boutiques_task/views/_form_js.html.erb b/BrainPortal/cbrain_plugins/cbrain-plugins-base/cbrain_task/boutiques_task/views/_form_js.html.erb index 268cc5b10..f8adacca5 100644 --- a/BrainPortal/cbrain_plugins/cbrain-plugins-base/cbrain_task/boutiques_task/views/_form_js.html.erb +++ b/BrainPortal/cbrain_plugins/cbrain-plugins-base/cbrain_task/boutiques_task/views/_form_js.html.erb @@ -35,7 +35,7 @@ cbcsvs = interface_files.where(:type => 'CbrainFileList').to_a cbcsvToFiles = cbcsvs.map do |f| # Only used for preview button f.sync_to_cache # silly and blocking - ids = f.ordered_raw_ids.reject { |i| i.blank? || i == 0 } + ids = f.ordered_raw_ids.reject { |i| i.blank? || i == 0 } rescue [] names = Userfile.find_all_accessible_by_user(@task.user, :access_requested => :read).where( 'userfiles.id' => ids).pluck(:name) [ f.name, names ] end.to_h diff --git a/BrainPortal/cbrain_plugins/cbrain-plugins-base/userfiles/cbrain_file_list/views/_cb_file_list.html.erb b/BrainPortal/cbrain_plugins/cbrain-plugins-base/userfiles/cbrain_file_list/views/_cb_file_list.html.erb index cdfa2695b..b06b29be0 100644 --- a/BrainPortal/cbrain_plugins/cbrain-plugins-base/userfiles/cbrain_file_list/views/_cb_file_list.html.erb +++ b/BrainPortal/cbrain_plugins/cbrain-plugins-base/userfiles/cbrain_file_list/views/_cb_file_list.html.erb @@ -22,7 +22,18 @@ # -%> -<% if @userfile.is_locally_synced? %> +<% + csv_array = @userfile.cached_csv_array rescue nil +%> + +<% if csv_array.nil? %> + +
+
+ Invalid CBRAIN File list, possibly not even CSV. Please verify the file type. No files found. +
+ +<% elsif @userfile.is_locally_synced? %>

This type of file contains a list of other CBRAIN files that can be used as input @@ -38,8 +49,9 @@ can be missing or wrong).

+ <% - csv_array = @userfile.cached_csv_array + csv_array ||= [] per_page = 500 nb_row = csv_array.size page = (params[:page] || 1).to_i