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 +++----- app/controllers/events_controller.rb | 7 ++++--- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'app/controllers') 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 diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb index d581de16..7ace5c1d 100644 --- a/app/controllers/events_controller.rb +++ b/app/controllers/events_controller.rb @@ -10,11 +10,12 @@ class EventsController < ApplicationController # GET /events # GET /events.xml def index - @events = Event.order(:id) + scope = Event.order(Arel.sql("start_time DESC NULLS LAST")) + scope = scope.merge(Event.editor_search(params[:q])) if params[:q].present? respond_to do |format| - format.html { @events = @events.paginate(page: params[:page], per_page: 25) } - format.xml { render :xml => @events } + format.html { @events = scope.paginate(:page => params[:page], :per_page => 25) } + format.xml { render :xml => scope } end end -- cgit v1.3