Temporary fix for postgres enums pending rails 3.0.4

This commit is contained in:
Tom Hughes 2010-12-07 00:23:37 +00:00
parent feef62b1cc
commit 7f556f94f1
3 changed files with 5 additions and 5 deletions

View file

@ -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)

View file

@ -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],

View file

@ -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]})