From 68fa607811e681535cc3db03d3a57a4654dd8292 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Thu, 3 Aug 2023 10:56:05 +0100 Subject: [PATCH] Use hashes to define where..in sql queries This is preferable to using SQL statements. --- app/controllers/application_controller.rb | 2 +- app/models/trace.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index d22a031d4..5dcfee07c 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -22,7 +22,7 @@ class ApplicationController < ActionController::Base def authorize_web if session[:user] - self.current_user = User.where(:id => session[:user]).where("status IN ('active', 'confirmed', 'suspended')").first + self.current_user = User.where(:id => session[:user], :status => %w[active confirmed suspended]).first if session[:fingerprint] && session[:fingerprint] != current_user.fingerprint diff --git a/app/models/trace.rb b/app/models/trace.rb index 0b9877225..35fee0bf4 100644 --- a/app/models/trace.rb +++ b/app/models/trace.rb @@ -35,7 +35,7 @@ class Trace < ApplicationRecord has_many :points, :class_name => "Tracepoint", :foreign_key => "gpx_id", :dependent => :delete_all, :inverse_of => :trace scope :visible, -> { where(:visible => true) } - scope :visible_to, ->(u) { visible.where("visibility IN ('public', 'identifiable') OR user_id = ?", u) } + scope :visible_to, ->(u) { visible.where(:visibility => %w[public identifiable]).or(visible.where(:user => u)) } scope :visible_to_all, -> { where(:visibility => %w[public identifiable]) } scope :tagged, ->(t) { joins(:tags).where(:gpx_file_tags => { :tag => t }) } -- 2.39.5