scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-14 17:14:54 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7266 from artoscinote/ma_SCI_10433

Browse source 
Fix ambiguous column references in results controller [SCI-10433]
This commit is contained in:
Martin Artnik 2024-03-13 10:55:49 +01:00 • committed by GitHub
commit 560ff947e5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/controllers/results_controller.rb
View file

@ -148,17 +148,17 @@ class ResultsController < ApplicationController
def apply_sort!
case params[:sort]
when 'updated_at_asc'
@results = @results.order(updated_at: :asc)
@results = @results.order('results.updated_at' => :asc)
when 'updated_at_desc'
@results = @results.order(updated_at: :desc)
@results = @results.order('results.updated_at' => :desc)
when 'created_at_asc'
@results = @results.order(created_at: :asc)
@results = @results.order('results.created_at' => :asc)
when 'created_at_desc'
@results = @results.order(created_at: :desc)
@results = @results.order('results.created_at' => :desc)
when 'name_asc'
@results = @results.order(name: :asc)
@results = @results.order('results.name' => :asc)
when 'name_desc'
@results = @results.order(name: :desc)
@results = @results.order('results.name' => :desc)
end
end
@ -167,10 +167,10 @@ class ResultsController < ApplicationController
@results = @results.search(current_user, params[:view_mode] == 'archived', params[:query], params[:page] || 1)
end
@results = @results.where('created_at >= ?', params[:created_at_from]) if params[:created_at_from]
@results = @results.where('created_at <= ?', params[:created_at_to]) if params[:created_at_to]
@results = @results.where('updated_at >= ?', params[:updated_at_from]) if params[:updated_at_from]
@results = @results.where('updated_at <= ?', params[:updated_at_to]) if params[:updated_at_to]
@results = @results.where('results.created_at >= ?', params[:created_at_from]) if params[:created_at_from]
@results = @results.where('results.created_at <= ?', params[:created_at_to]) if params[:created_at_to]
@results = @results.where('results.updated_at >= ?', params[:updated_at_from]) if params[:updated_at_from]
@results = @results.where('results.updated_at <= ?', params[:updated_at_to]) if params[:updated_at_to]
end
def load_my_module