From 7f556f94f1d479346cbefb5cbeec0a6a0b7b8547 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 7 Dec 2010 00:23:37 +0000 Subject: [PATCH] Temporary fix for postgres enums pending rails 3.0.4 --- app/controllers/application_controller.rb | 2 +- app/controllers/diary_entry_controller.rb | 4 ++-- app/controllers/trace_controller.rb | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index e22f64c76..3506b4196 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -11,7 +11,7 @@ class ApplicationController < ActionController::Base def authorize_web if session[:user] - @user = User.where(:status => ["active", "confirmed", "suspended"]).find(session[:user]) + @user = User.where(:id => session[:user]).where("status IN ('active', 'confirmed', 'suspended')").first if @user.status == "suspended" session.delete(:user) diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb index 0946c0136..b9eb1c2d6 100644 --- a/app/controllers/diary_entry_controller.rb +++ b/app/controllers/diary_entry_controller.rb @@ -114,7 +114,7 @@ class DiaryEntryController < ApplicationController @entries = DiaryEntry.includes(:user).order("created_at DESC").limit(20) if params[:display_name] - user = User.where(:status => ["active", "confirmed"]).find_by_display_name(params[:display_name]) + user = User.where("status IN ('active', 'confirmed')").find_by_display_name(params[:display_name]) if user @entries = @entries.where(:user_id => user.id, :visible => true ) @@ -141,7 +141,7 @@ class DiaryEntryController < ApplicationController end def view - user = User.where(:status => ["active", "confirmed"]).find_by_display_name(params[:display_name]) + user = User.where("status IN ('active', 'confirmed')").find_by_display_name(params[:display_name]) if user @entry = DiaryEntry.where(:id => params[:id], diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb index 1381e71eb..f381b3243 100644 --- a/app/controllers/trace_controller.rb +++ b/app/controllers/trace_controller.rb @@ -27,7 +27,7 @@ class TraceController < ApplicationController # from display name, pick up user id if one user's traces only display_name = params[:display_name] if !display_name.blank? - target_user = User.where(:status => ["active", "confirmed"], :display_name => display_name).first + target_user = User.where("status IN ('active', 'confirmed')").where(:display_name => display_name).first if target_user.nil? @title = t'trace.no_such_user.title' @not_found_user = display_name @@ -214,7 +214,7 @@ class TraceController < ApplicationController end def georss - traces = Trace.where(:visibility => [:public, :identifiable]) + traces = Trace.where("visibility IN ('public', 'identifiable')") if params[:display_name] traces = traces.where(:users => {:display_name => params[:display_name]}) -- 2.43.2