added field name in register form

faulkner · Mar 28, 2012 · ba7039b · ba7039b
1 parent 8e0797b
commit ba7039b
Show file tree

Hide file tree

Showing 3 changed files with 311 additions and 307 deletions.
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -41,6 +41,7 @@ class User < ActiveRecord::Base
   validates_uniqueness_of :uid, :scope => :provider
   validates_length_of :bio, :maximum => 140
   validates :email, :email => true, :allow_nil => true, :allow_blank => true
+  validates :name, :presence => true, :if => :is_devise?
 
   validates_presence_of     :email, :if => :is_devise?
   validates_uniqueness_of   :email, :scope => :provider, :if => :is_devise?

diff --git a/app/views/layouts/_login.html.haml b/app/views/layouts/_login.html.haml
@@ -21,6 +21,9 @@
           = label_tag 'remember_meber_me', t('.remember_me'), :class => 'inline'
     #new_email_account{:class=>"#{(params[:show_new_user].present? ? "" : "hide")}"}
       = form_for(User.new, :as => :user, :url => registration_path(:user), :html => {:class => 'login_with_email_form'}) do |f|
+        %p.input
+          = f.label :name
+          = f.text_field :name
         %p.input
           = f.label :email
           = f.text_field :email