Skip to content
This repository has been archived by the owner on Nov 26, 2019. It is now read-only.

CHF::Env feature flags to turn off riiif use on viewer and download link #690

Merged
merged 6 commits into from
Jul 13, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 20 additions & 7 deletions app/models/chf/env.rb
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,16 @@ def self.instance

define_key :use_image_server_on_show_page,
system_env_transform: BOOLEAN_TRANSFORM,
default: -> { true }
default: -> { false }

define_key :use_image_server_on_viewer,
system_env_transform: BOOLEAN_TRANSFORM,
default: -> { false }

define_key :use_image_server_downloads,
system_env_transform: BOOLEAN_TRANSFORM,
default: -> { false }


define_key :riiif_originals_cache, default: -> {
Rails.env.production? ? "/var/sufia/riiif-originals" : Rails.root.join("tmp", "riiif-originals").to_s
Expand All @@ -153,12 +162,16 @@ def self.instance
# but for now we calculate based on app_role value, but do it here
# so we have one place to change.
# Can still override with ENV or local_env.yml locally, nice!
define_key :serve_riiif_paths, default: -> {
lookup(:app_role).blank? || lookup(:app_role) == "riiif"
}
define_key :serve_app_paths, default: -> {
lookup(:app_role).blank? || lookup(:app_role) == "app"
}
define_key :serve_riiif_paths,
system_env_transform: BOOLEAN_TRANSFORM,
default: -> {
lookup(:app_role).blank? || lookup(:app_role) == "riiif"
}
define_key :serve_app_paths,
system_env_transform: BOOLEAN_TRANSFORM,
default: -> {
lookup(:app_role).blank? || lookup(:app_role) == "app"
}

end
end
26 changes: 13 additions & 13 deletions app/views/curation_concerns/base/_chf_download_menu.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,18 @@ locals:
analytics_label: parent.id
}) %>
</li>
<li>
<%= link_to("Full-size JPEG",
(member ? riiif_image_url(member.riiif_file_id, format: "jpg", size: "full") : "#"),
target: "_new",
data: {
content_hook: "dl-jpeg-link",
# These action/labels are based on what sufia/hyrax uses, although
# a bit weird.
analytics_category: "Work",
analytics_action: "download-jpg",
analytics_label: parent.id
}) %>
</li>
<% if CHF::Env.lookup(:use_image_server_downloads) %>
<li>
<%= link_to("Full-size JPEG",
(member ? riiif_image_url(member.riiif_file_id, format: "jpg", size: "full") : "#"),
target: "_new",
data: {
content_hook: "dl-jpeg-link",
analytics_category: "Work",
analytics_action: "download-jpg",
analytics_label: parent.id
}) %>
</li>
<% end %>
</ul>

10 changes: 8 additions & 2 deletions app/views/curation_concerns/base/_chf_image_viewer.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,14 @@
member_id: member_presenter.representative_id,
member_show_url: contextual_path(member_presenter, work),
member_dl_original_url: main_app.download_path(member_presenter.representative_id),
member_dl_jpeg_url: riiif_image_url(member_presenter.riiif_file_id, format: "jpg", size: "full"),
tile_source: riiif_info_url(member_presenter.riiif_file_id),
member_dl_jpeg_url: (if CHF::Env.lookup(:use_image_server_downloads)
riiif_image_url(member_presenter.riiif_file_id, format: "jpg", size: "full")
end),
tile_source: (if CHF::Env.lookup(:use_image_server_on_viewer)
riiif_info_url(member_presenter.riiif_file_id)
else
{"type" => "image", "url" => main_app.download_path(member_presenter.representative_id, file: "jpeg")}.to_json
end),
src: member_presenter.first(blacklight_config.view_config(document_index_view_type).thumbnail_field)
} if member_presenter.riiif_file_id # don't show it in the viewer if there's no image
-%>
Expand Down