cleanup of 2 files uncleaned in extraction

cschneid · Feb 9, 2009 · f952b6e · f952b6e
1 parent 53afd09
commit f952b6e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 16 deletions.
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.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

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -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