app/models/concerns/bulkrax/file_factory.rb in bulkrax-8.0.0 vs app/models/concerns/bulkrax/file_factory.rb in bulkrax-8.1.0
- old
+ new
@@ -30,10 +30,12 @@
delegate :file_attributes, :destroy_existing_files, to: :file_set_factory_inner_workings
end
class InnerWorkings
+ include Loggable
+
def initialize(object_factory:)
@object_factory = object_factory
end
attr_reader :object_factory
@@ -117,11 +119,11 @@
# Destroy all file_sets for this object
# Reload the object to ensure the remaining methods have the most up to date object
def destroy_existing_files
return unless object.present? && object.file_sets.present?
object.file_sets.each do |fs|
- Hyrax::Actors::FileSetActor.new(fs, @user).destroy
+ Hyrax::Actors::FileSetActor.new(fs, user).destroy
end
@object = object.reload
log_deleted_fs(object)
end
@@ -153,9 +155,11 @@
# method
@local_file_sets ||= ordered_file_sets
end
def ordered_file_sets
+ return [] if object.blank?
+
Bulkrax.object_factory.ordered_file_sets_for(object)
end
##
# @return [Array<Integer>] An array of Hyrax::UploadFile#id representing the