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/events_controller.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'app/controllers/events_controller.rb') 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