From c06723ee715512c2033c7786c48f15674585b56b Mon Sep 17 00:00:00 2001 From: erdgeist Date: Fri, 26 Jun 2026 01:59:57 +0200 Subject: Stage 4: Rails 5.2 -> 6.1 on Ruby 2.7.2 - routing-filter 0.6.3 -> 0.7.0 (Rails 6.1 compatibility) - RSS named routes rss_xml/rss_rdf added - RouteWithParams workarounds: will_paginate_patch, content_path shim, safe_path helper - Paperclip removed, replaced with FileAttachment concern (preserves URL scheme) - Assets resource moved to /admin/assets (Sprockets middleware conflict) - ApplicationRecord base class added, all models migrated - Strong parameters added to Assets, Occurrences, Events, MenuItems controllers - update_attributes -> update throughout - render :nothing -> head :ok/:not_found throughout - language_selector rewritten (removes :overwrite_params) - Environment files updated for Rails 6.1 (eager_load, public_file_server, ActionMailer) - Arel::Visitors::DepthFirst and Integer/Float duration patches removed from test_helper - AssetsController tests added (10 tests covering upload, variants, destroy, auth) - ImageMagick geometry: 460x250! for headline crop (not # which is invalid in IM6) 129 runs, 311 assertions, 5 failures (all pre-existing), 0 errors --- app/controllers/assets_controller.rb | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'app/controllers/assets_controller.rb') diff --git a/app/controllers/assets_controller.rb b/app/controllers/assets_controller.rb index a11bbdd..d150e06 100644 --- a/app/controllers/assets_controller.rb +++ b/app/controllers/assets_controller.rb @@ -7,10 +7,9 @@ class AssetsController < ApplicationController layout 'admin' def index - @assets = Asset.all.paginate( - :page => params[:page], - :per_page => 20, - :order => 'id DESC' + @assets = Asset.order('id DESC').paginate( + :page => params[:page], + :per_page => 20 ) end @@ -44,7 +43,7 @@ class AssetsController < ApplicationController # POST /assets # POST /assets.xml def create - @asset = Asset.new(params[:asset]) + @asset = Asset.new(asset_params) respond_to do |format| if @asset.save @@ -64,7 +63,7 @@ class AssetsController < ApplicationController @asset = Asset.find(params[:id]) respond_to do |format| - if @asset.update_attributes(params[:asset]) + if @asset.update(asset_params) flash[:notice] = 'Asset was successfully updated.' format.html { redirect_to(@asset) } format.xml { head :ok } @@ -86,4 +85,10 @@ class AssetsController < ApplicationController format.xml { head :ok } end end + + private + + def asset_params + params.require(:asset).permit(:name, :upload) + end end -- cgit v1.3