From 6947f1aaea256a6341f91ed735ae24b93f705dab Mon Sep 17 00:00:00 2001
From: Nico <info@nicolasbally.com>
Date: Wed, 9 Jan 2013 00:16:23 +0100
Subject: [PATCH] magick encoding

---
 app/models/admin.rb                    | 11 +----------
 app/views/devise/sessions/new.html.erb |  4 ++--
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/app/models/admin.rb b/app/models/admin.rb
index bfc8b82..7fcc743 100644
--- a/app/models/admin.rb
+++ b/app/models/admin.rb
@@ -12,14 +12,5 @@ class Admin < ActiveRecord::Base
   attr_accessible :email, :password, :password_confirmation, :remember_me, :username, :name, :firstname
   # attr_accessible :title, :body
   
-  
-	protected
-
-	 def self.find_for_database_authentication(warden_conditions)
-	   conditions = warden_conditions.dup
-	   login = conditions.delete(:login)
-	   where(conditions).where(["username = :value OR email = :value", { :value => login }]).first
-	 end
-  
-  
+ 
 end
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index 4cbfba5..83bf324 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -1,8 +1,8 @@
 <h2>Sign in</h2>
 
 <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
-  <div><%= f.label :login %><br />
-	  <%= f.text_field :login %></div>
+  <div><%= f.label :username %><br />
+	  <%= f.text_field :username %></div>
 
   <div><%= f.label :password %><br />
   <%= f.password_field :password %></div>