Skip to content

Commit

Permalink
call the cops
Browse files Browse the repository at this point in the history
  • Loading branch information
orangewolf committed Jun 19, 2024
1 parent 4a8dcb4 commit d89024a
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 11 deletions.
6 changes: 3 additions & 3 deletions app/actors/hyrax/actors/file_actor_decorator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ def perform_ingest_file_through_active_fedora(io)
# Skip versioning because versions will be minted by VersionCommitter as necessary during
# save_characterize_and_record_committer.
Hydra::Works::AddFileToFileSet.call(file_set,
io,
relation,
versioning: false)
io,
relation,
versioning: false)
end
return false unless file_set.save
repository_file = related_file
Expand Down
8 changes: 4 additions & 4 deletions app/models/file_set.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ class FileSet < ActiveFedora::Base
end

property :s3_only,
predicate: ::RDF::URI("https://hykucommons.org/terms/s3_only"),
multiple: false do |index|
index.as :stored_searchable, :facetable
end
predicate: ::RDF::URI("https://hykucommons.org/terms/s3_only"),
multiple: false do |index|
index.as :stored_searchable, :facetable
end

include ::Hyrax::FileSetBehavior
# @return [String] the Attachment's rdf type for the given FileSet
Expand Down
6 changes: 4 additions & 2 deletions app/views/_user_util_links.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
<%= render 'shared/locale_picker' if available_translations.size > 1 %>
<% if user_signed_in? %>
<li>
<%= render_notifications(user: current_user) %>
<% unless Rails.env.development? %>
<%= render_notifications(user: current_user) %>
<% end %>
</li>
<li class="dropdown">
<%= link_to hyrax.dashboard_profile_path(current_user), role: 'button', data: { toggle: 'dropdown' }, aria: { haspopup: true, expanded: false, controls: 'user-util-links' } do %>
Expand All @@ -27,4 +29,4 @@
<% end %>
</li>
<% end %>
</ul>
</ul>
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ services:
condition: service_healthy

fcrepo:
image: ghcr.io/samvera/fcrepo4:4.7.5
image: ghcr.io/scientist-softserv/docker-fcrepo:4.7.6-s3-streaming
volumes:
- fcrepo:/data:cached
env_file:
Expand Down Expand Up @@ -217,7 +217,7 @@ services:
- >
solrcloud-upload-configset.sh /app/samvera/hyrax-webapp/solr/conf &&
solrcloud-assign-configset.sh &&
SOLR_COLLECTION_NAME=hydra-test solrcloud-assign-configset.sh &&
SOLR_COLLECTION_NAME=hydra-test solrcloud-assign-configset.sh && bundle &&
db-migrate-seed.sh
depends_on:
db:
Expand Down

0 comments on commit d89024a

Please sign in to comment.