Skip to content

Commit

Permalink
Merge pull request #5765 from samvera/test_ci_engine_cart_rails_options
Browse files Browse the repository at this point in the history
Fix application generation
  • Loading branch information
bwatson78 authored Jul 1, 2022
2 parents d456d17 + f90a885 commit b680672
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 14 deletions.
3 changes: 3 additions & 0 deletions .engine_cart.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
rails_options:
- "--database=postgresql"
- "--skip-javascript"
3 changes: 2 additions & 1 deletion .regen
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
500bl7boot4rails6
# When updating CI regen seed, set to current date.
2022-07-01T00
8 changes: 1 addition & 7 deletions lib/generators/hyrax/install_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -163,13 +163,6 @@ def datatables
end
end

def twitter_typeahead
javascript_manifest = 'app/assets/javascripts/application.js'
insert_into_file javascript_manifest, after: /popper\n/ do
"//= require twitter/typeahead\n"
end
end

def noid_rails_database_minter_initialize
generate 'noid:rails:install'
end
Expand All @@ -184,6 +177,7 @@ def riiif_image_server

def universalviewer_files
rake('hyrax:universal_viewer:install')
rake('yarn:install')
end
end
end
6 changes: 0 additions & 6 deletions lib/generators/hyrax/templates/catalog_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,6 @@ def self.modified_field
end

configure_blacklight do |config|
config.view.gallery(document_component: Blacklight::Gallery::DocumentComponent)
config.view.masonry(document_component: Blacklight::Gallery::DocumentComponent)
config.view.slideshow(document_component: Blacklight::Gallery::SlideshowComponent)

config.show.tile_source_field = :content_metadata_image_iiif_info_ssm
config.show.partials.insert(1, :openseadragon)
config.search_builder_class = Hyrax::CatalogSearchBuilder

# Because too many times on Samvera tech people raise a problem regarding a failed query to SOLR.
Expand Down

0 comments on commit b680672

Please sign in to comment.