Skip to content
Snippets Groups Projects
Commit b758936f authored by Gyan Gupta's avatar Gyan Gupta Committed by Anusha Ranganathan
Browse files

Fix indexing issue for files_size

parent 7a4aaa08
No related branches found
No related tags found
1 merge request!355Fix indexing issue for files_size
......@@ -13,6 +13,16 @@ class Collection < ActiveFedora::Base
include Hyrax::BasicMetadata
def after_update_nested_collection_relationship_indices
@during_save = false
reindex_nested_relationships_for(id: id, extent: Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX)
end
def update_nested_collection_relationship_indices
return if @during_save
reindex_nested_relationships_for(id: id, extent: Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX)
end
def manager_role
Role.find_by_name("#{collection_type.title.parameterize(separator: '_')}_manager")
end
......
......@@ -58,8 +58,8 @@ module ExternalServices
if s3.bucket_exists?(bucket_name)
list_of_objects, total_size, list_of_format = s3.list_all_objects(bucket_name, nil, true)
return true if (self.format == list_of_format && self.files_size == [total_size])
self.files_size = [total_size]
return true if (self.format == list_of_format && self.files_size.first.to_i == total_size)
self.files_size = [total_size.to_s]
self.format = list_of_format
self.date_modified = DateTime.now
end
......
......@@ -58,7 +58,7 @@ module S3FileHandleable
s3service.init_client
bucket_name = s3service.sanitise_name(crc_dataset.id)
list_of_objects, total_size, list_of_format = s3service.list_all_objects(bucket_name, nil, true)
crc_dataset.update(date_modified: DateTime.now, files_size: [total_size], format:list_of_format)
crc_dataset.update(date_modified: DateTime.now, files_size: [total_size.to_s], format:list_of_format)
end
......
......@@ -100,7 +100,6 @@ class CrcDataset < ActiveFedora::Base
end
property :files_size, predicate: ::RDF::Vocab::Rdms.size do |index|
index.type :integer
index.as :stored_searchable
end
......
......@@ -101,7 +101,6 @@ class Dataset < ActiveFedora::Base
end
property :files_size, predicate: ::RDF::Vocab::Rdms.size do |index|
index.type :integer
index.as :stored_searchable
end
......
<div class="download-all">
<% total_size = (@crc_dataset || @dataset).files_size.first || 0 %>
<% total_size = (@crc_dataset || @dataset).files_size.first.presence.to_i %>
<% message = total_size < ENV.fetch('DOWNLOAD_FILES_SIZE_LIMIT', '100000000').to_i ? '.zip_file_message' : '.shell_file_message' %>
<%= link_to t(:'hyrax.download_all'), main_app.download_all_path(presenter.id), disabled: download_all_button_available?(presenter.id) ? false : true, id: "download-all", class: "btn btn-default matomo_download", data:{ document_id: presenter.id } %>
<span class="fa fa-info-circle download-info" data-toggle="tooltip" title="<%= t("#{message}", size: total_size.to_s(:human_size))%>" aria-hidden="true"></span>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment