penguincoder
/
binaryattraction
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git@github.com:penguincoder/binaryattraction

master
Coleman 2008-12-10 00:25:46 -06:00
parent 71ce811c7e 7731234032
commit 872c832f38
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/users.rb
View File

@ -5,8 +5,8 @@ class Users < Application
include Ambethia::ReCaptcha::Controller
def index
if current_user.administrator?
@users = User.find :all, :order => 'user_name ASC'
if logged_in? and current_user.administrator?
@users = User.find :all, :order => 'user_name ASC', :conditions => 'facebook_id IS NULL'
render
else
redirect url(:user, :id => current_user.user_name)

5
binaryattraction_facebooker.rb
View File

@ -16,7 +16,7 @@
#
# libraries used
%w(rubygems frankie active_record yaml memcache memcache_util).each do |lib|
%w(rubygems frankie mysql active_record yaml memcache memcache_util).each do |lib|
require lib
end
# require AR models
@ -46,8 +46,9 @@ configure do
log.debug "Using #{Sinatra.env} database environment"
db_config = YAML::load_file(File.dirname(__FILE__) + '/config/database.yml')[Sinatra.env]
ActiveRecord::Base.logger = log
ActiveRecord::Base.establish_connection db_config
ActiveRecord::Base.allow_concurrency = true
ActiveRecord::Base.verification_timeout = 300
ActiveRecord::Base.establish_connection db_config
rescue => exception
log.fatal "There was a problem loading the database.yml file:"
exception.backtrace.each do |msg|