diff options
author | Hans de Graaff <graaff@gentoo.org> | 2019-07-22 18:56:58 +0200 |
---|---|---|
committer | Hans de Graaff <graaff@gentoo.org> | 2019-07-22 18:56:58 +0200 |
commit | a1b7c2071bfaaadcfb2b8cbca8c5aafabb12923a (patch) | |
tree | 9c198fc51149a7601cb1164dcd4ac03079010efc /app | |
parent | Add ETag and Last-Modified headers based on specific package (diff) | |
download | packages-5-a1b7c2071bfaaadcfb2b8cbca8c5aafabb12923a.tar.gz packages-5-a1b7c2071bfaaadcfb2b8cbca8c5aafabb12923a.tar.bz2 packages-5-a1b7c2071bfaaadcfb2b8cbca8c5aafabb12923a.zip |
Update to Rails 5.1
This also fixes a bug in the fresh_when handling for the changelog
view, which was exposed by the update (due to ETag now taking the
flash message, if any, into account).
Signed-off-by: Hans de Graaff <graaff@gentoo.org>
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/packages_controller.rb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/app/controllers/packages_controller.rb b/app/controllers/packages_controller.rb index de24b40..64cb289 100644 --- a/app/controllers/packages_controller.rb +++ b/app/controllers/packages_controller.rb @@ -37,15 +37,15 @@ class PackagesController < ApplicationController @package = Package.find_by(:atom, params[:id]) fail ActionController::RoutingError, 'No such package' unless @package - fresh_when etag: @package.updated_at, last_modified: @package.updated_at, public: true - - @changelog = Rails.cache.fetch("changelog/#{@package.atom}") do - Portage::Util::History.for(@package.category, @package.name, 5) - end + if stale?(etag: @package.updated_at, last_modified: @package.updated_at, public: true) + @changelog = Rails.cache.fetch("changelog/#{@package.atom}") do + Portage::Util::History.for(@package.category, @package.name, 5) + end - respond_to do |wants| - wants.html { render layout: false } - wants.json {} + respond_to do |wants| + wants.html { render layout: false } + wants.json {} + end end end |