Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes for staging errors #28

Merged
merged 4 commits into from
Oct 3, 2023
Merged

Fixes for staging errors #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b03a6b4
Update hyrax-webapp/hyku sha
ShanaLMoore Oct 3, 2023
902dbe7
:bug: resolve no method error in staging
ShanaLMoore Oct 3, 2023
fae3cc2
:bug: fix for resource_path error
ShanaLMoore Oct 3, 2023
810b3f4
🐛 fix super class loading error
ShanaLMoore Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/forms/hyrax/forms/admin/appearance_decorator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ module AppearanceDecorator
'footer_link_color' => '#985F03',
'footer_link_hover_color' => '#000000',
'primary_button_hover_color' => '#CE8C00',
'default_button_background_color' => '#ffffff',
'default_button_border_color' => '#5B5B5B',
'default_button_text_color' => '#FFFFFF',
'active_tabs_background_color' => '#FFFFFF',
Expand All @@ -32,7 +33,7 @@ module AppearanceDecorator

# OVERRIDE to add adventist's custom header & footer
def default_values
ADL_DEFAULT_FONTS.merge(ADL_DEFAULT_COLORS)
@default_values ||= ADL_DEFAULT_FONTS.merge(ADL_DEFAULT_COLORS)
end

def custom_adl_header_footer_color
Expand Down
12 changes: 7 additions & 5 deletions app/presenters/hyrax/generic_work_presenter_decorator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@

# Generated via
# `rails generate hyrax:work GenericWork`
module Hyrax
class GenericWorkPresenter < Hyku::WorkShowPresenter
delegate :aark_id, :abstract, :date_issued, :alt, :part_of, :place_of_publication, :remote_url, to: :solr_document
end
end
# module Hyrax
# class GenericWorkPresenter < Hyku::WorkShowPresenter
# delegate :aark_id, :abstract, :date_issued, :alt, :part_of, :place_of_publication, :remote_url, to: :solr_document
# end
# end

Hyrax::GenericWorkPresenter.delegate :aark_id, :abstract, :date_issued, :alt, :part_of, :place_of_publication, :remote_url, to: :solr_document
6 changes: 2 additions & 4 deletions app/views/_user_util_links.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@
<%= link_to t(:'hyrax.controls.home'), hyrax.root_path, aria: current_page?(hyrax.root_path) ? {current: 'page'} : nil %></li>
<li <%= 'class=active' if current_page?(hyrax.about_path) %>>
<%= link_to t(:'hyrax.controls.about'), hyrax.about_path, aria: current_page?(hyrax.about_path) ? {current: 'page'} : nil %></li>
<% if defined?(resources_path) %> <%#= TODO remove when path fix is merged %>
<li <%= 'class=active' if current_page?(main_app.resources_path) %>>
<%= link_to t(:'hyrax.controls.resources'), main_app.resources_path, aria: current_page?(main_app.resources_path) ? {current: 'page'} : nil %></li>
<% end %>
<li <%= 'class=active' if current_page?(hyku_knapsack.resources_path) %>>
<%= link_to t(:'hyrax.controls.resources'), hyku_knapsack.resources_path, aria: current_page?(hyku_knapsack.resources_path) ? {current: 'page'} : nil %></li>
<li <%= 'class=active' if current_page?(hyrax.contact_path) %>>
<%= link_to t(:'hyrax.controls.contact'), hyrax.contact_path, aria: current_page?(hyrax.contact_path) ? {current: 'page'} : nil %></li>
<% if user_signed_in? %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/shared/_footer.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</div>
<div class="col-xs-12 col-sm-6">
<div class="footer-logo">
<a href="<%= root_path %>">
<a href="<%= hyrax.root_path %>">
<%= image_tag "ADL-footer-logo.png", :class => "logo-img" %>
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion hyrax-webapp
Open in desktop
Submodule hyrax-webapp updated 4 files
+1 −1 config/initializers/apartment.rb
+16 −0 db/migrate/20230406183810_setup_good_jobs_schema.rb
+2 −0 db/schema.rb
+4 −2 docker-compose.yml
Loading