From af2c6fd85e13139be3e3b2329a51c3a35acb3c40 Mon Sep 17 00:00:00 2001 From: erdgeist Date: Wed, 5 Aug 2026 23:56:56 +0200 Subject: Search assets and events, and order events by when they happen --- app/controllers/assets_controller.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'app/controllers/assets_controller.rb') diff --git a/app/controllers/assets_controller.rb b/app/controllers/assets_controller.rb index 801e0968..f8a7d1e4 100644 --- a/app/controllers/assets_controller.rb +++ b/app/controllers/assets_controller.rb @@ -6,12 +6,10 @@ class AssetsController < ApplicationController before_action :login_required layout 'admin' - + def index - @assets = Asset.order('id DESC').paginate( - :page => params[:page], - :per_page => 20 - ) + scope = params[:q].present? ? Asset.editor_search(params[:q]) : Asset.all + @assets = scope.order("id DESC").paginate(:page => params[:page], :per_page => 20) end # GET /assets/1 -- cgit v1.3