Skip to content

Commit

Permalink
Merge pull request #93 from Det-Kongelige-Bibliotek/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
davidgrove73 authored Dec 14, 2017
2 parents ab3d92b + 3bef49d commit 12c947b
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion app/views/catalog/_home_text.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<% #exhibits.each_slice(3).each do |row| %>
<div class="row"><!-- start main content row -->
<% cache('edition-cards', expires_in: 1.hour) do %>
<% cache("edition-cards-#{get_lang(params)}", expires_in: 1.hour) do %>
<%= render partial: 'edition_card' %>
<% end %>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/views/tree/_show_tree.erb
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ different format for the facets (I think it's bug in Blacklight)-->

<% if subject_id %>
<!--Show the tree -->
<% cache(subject_id.gsub('/','#'), expires_in: 1.hour) do %>
<% cache("#{subject_id.gsub('/','#')}-#{get_lang(params)}", expires_in: 1.hour) do %>
<%= render :partial => 'tree/tree', locals: {:subject_id => subject_id, :lang => lang, :filter_params_url => filter_params_url} %>
<% end %>
<% else %>
<% cache('subject-all', expires_in: 1.hour) do %>
<% cache("subject-all-#{get_lang(params)}", expires_in: 1.hour) do %>
<%= render :partial => 'tree/tree', locals: {:subject_id => "/editions/any/2009/jul/editions", :lang => lang, :filter_params_url => filter_params_url} %>
<% end %>
<% end %>
2 changes: 1 addition & 1 deletion config/environments/development.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#cache settings
config.action_controller.perform_caching = true
config.cache_store = :memory_store, { size: 64.megabytes }
config.cache_store = :file_store, 'cache'

# Don't care if the mailer can't send.
config.action_mailer.raise_delivery_errors = false
Expand Down
2 changes: 1 addition & 1 deletion config/environments/production.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

#cache settings
config.action_controller.perform_caching = true
config.cache_store = :memory_store, {size: 64.megabytes}
config.cache_store = :file_store, 'cache'
config.public_file_server.headers = {
'Cache-Control' => 'public, max-age=172800'
}
Expand Down

0 comments on commit 12c947b

Please sign in to comment.