drop old style boutiques and additional checks

Author: MontrealSergiy

BrainPortal/lib/cbrain_task_generators/templates/portal.rb.erb

@@ -439,8 +439,7 @@ class CbrainTask::<%= name %> < <%= (descriptor['custom'] || {})['cbrain:inherit
       begin # Check that the user has access to all of the files in the cbcsv
         fs = f.userfiles_accessible_by_user!(self.user,nil,nil,file_access)
         for i in f.ordered_raw_ids.select{ |r| (! r.nil?) && (r.to_s != '0') }
-          accessible  = ! ( Userfile.find_accessible_by_user( i, self.user, :access_requested => file_access ) rescue nil ).nil?
-          accessible |= ! ( CbrainFileList.find_accessible_by_user( i, self.user, :access_requested => :read ) rescue nil ).nil?
+          accessible = ! ( Userfile.find_accessible_by_user( i, self.user, :access_requested => file_access ) rescue nil ).nil?
           params_errors.add( id, msg1.(i) ) unless accessible
           errFlag = false unless accessible
         end
@@ -464,17 +463,14 @@ class CbrainTask::<%= name %> < <%= (descriptor['custom'] || {})['cbrain:inherit
     # Get cbcsvs (note: we get files that end with cbcsv, but may not be of that class; the user is warned when this occurs, i.e. after_form fails)
     files = self.params[:interface_userfile_ids].map do |f|
       begin
-        # for file list read access is enough
-        file   = CbrainFileList.find_accessible_by_user( f, self.user, :access_requested => :read ) rescue nil
-        # for individual files or collections, write access is needed if tool may mutate inputs
-        file ||= Userfile.find_accessible_by_user( f, self.user, :access_requested => file_access )
+        Userfile.find_accessible_by_user( f, self.user, :access_requested => file_access )
       rescue => e
         params_errors.add(<%= ":'#{single_file['id']}'" %>, "encountered an error trying to find file #{f}. Ensure the file exists and you can access it.")
         return ""
       end
     end
     cbcsvs = files.select(&:presence).map do |f|
-      Userfile.find_accessible_by_user( f, self.user, :access_requested => :read )
+      Userfile.find_accessible_by_user( f, self.user, :access_requested => file_access )
     end.select do |f|
       f.is_a?(CbrainFileList) || (f.suggested_file_type || Object) <= CbrainFileList
     end
@@ -535,7 +531,7 @@ class CbrainTask::<%= name %> < <%= (descriptor['custom'] || {})['cbrain:inherit
     <%= "file_lists = [%s]" % file_lists.map { |f| ":'#{f['id']}'" }.join( ', ' ) %>
     return [] if files.nil? || files.length == 0
     files.select { |f| self.params[f].present? && ! file_lists.include?(f) } # Prevent problems with file-type inputs with list=true
-         .map    { |f| [f, Userfile.find_accessible_by_user(self.params[f], self.user, :access_requested => :read)] }
+         .map    { |f| [f, Userfile.find_accessible_by_user(self.params[f], self.user, :access_requested => file_access)] }
          .select { |f| f[1].is_a?(CbrainFileList) || (f[1].suggested_file_type || Object) <= CbrainFileList }
   end
 
@@ -571,8 +567,7 @@ class CbrainTask::<%= name %> < <%= (descriptor['custom'] || {})['cbrain:inherit
         tsk
       end
       # Expand cbcsvs and generate tasks from them
-      f   = CbrainFileList.find_accessible_by_user( id, self.user, :access_requested => :read ) rescue nil
-      f ||= Userfile.find_accessible_by_user( id, self.user, :access_requested => file_access )
+      f = Userfile.find_accessible_by_user( id, self.user, :access_requested => file_access )
       if f.is_a?( CbrainFileList )
         ufiles = f.userfiles_accessible_by_user!( self.user, nil, nil, file_access )
         # Skip files that are purposefully nil (e.g. given id 0 by the user)
@@ -729,9 +724,7 @@ class CbrainTask::<%= name %> < <%= (descriptor['custom'] || {})['cbrain:inherit
           next value
         end
 
-        file   = Userfile.find_accessible_by_user(value, self.user, :access_requested => file_access) rescue nil
-        file ||= CbrainFileList.find_accessible_by_user(value, self.user, :access_requested => :read) rescue nil
-        unless file
+        unless (file = Userfile.find_accessible_by_user(value, self.user, :access_requested => file_access) rescue nil)
           params_errors.add(name, ": cannot find userfile (ID #{value})")
           next value
         end