Permalink
Browse files

cleanup of 2 files uncleaned in extraction

  • Loading branch information...
1 parent 53afd09 commit f952b6e64b375214cd5c02172becf1c94b031359 Jerry Richardson committed Feb 9, 2009
Showing with 2 additions and 16 deletions.
  1. +2 −2 app/controllers/users_controller.rb
  2. +0 −14 app/models/user.rb
@@ -16,10 +16,10 @@ def edit
end
def update
- if current_user.admin? && params[:user][:admin] && params[:user][:admin] == "1"
+ if signed_in_as_admin? && params[:user][:admin] && params[:user][:admin] == "1"
@user.admin = true
@user.save
- elsif current_user.admin?
+ elsif signed_in_as_admin?
@user.admin = false
@user.save
end
View
@@ -1,19 +1,5 @@
class User < ActiveRecord::Base
include Clearance::App::Models::User
- has_attached_file :avatar, :styles => { :medium => "256x256", :thumb => "64x64", :mini => "32x32" }, :default_url => "/images/transparent.gif"
- attr_accessible :first_name, :last_name, :bio, :avatar, :location
- named_scope :stars, :conditions => { :star => true }
- has_many :posts
-
- # after_create :add_jabber_user
- #
- #
- # def add_jabber_user
- # end
-
- def full_name
- "#{first_name} #{last_name}"
- end
def admin?
self.admin

0 comments on commit f952b6e

Please sign in to comment.