Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

fix new user form

Browse source
This commit is contained in:
wvengen 2013-10-29 19:11:33 +01:00
parent 9ba425aafa
commit e13ca74df3
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/models/user.rb
View file

@ -27,8 +27,8 @@ class User < ActiveRecord::Base
validates_presence_of :email validates_presence_of :email
validates_presence_of :password, :on => :create validates_presence_of :password, :on => :create
validates_length_of :nick, :in => 2..25, :allow_nil => true validates_length_of :nick, :in => 2..25, :allow_nil => !FoodsoftConfig[:use_nick]
validates_uniqueness_of :nick, :case_sensitive => false, :allow_nil => true validates_uniqueness_of :nick, :case_sensitive => false, :allow_nil => !FoodsoftConfig[:use_nick]
validates_format_of :email, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i validates_format_of :email, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
validates_uniqueness_of :email, :case_sensitive => false validates_uniqueness_of :email, :case_sensitive => false
validates_length_of :first_name, :in => 2..50 validates_length_of :first_name, :in => 2..50

5
app/views/shared/_user_form_fields.html.haml
View file

@ -1,5 +1,6 @@
- unless FoodsoftConfig[:use_nick] == false - if FoodsoftConfig[:use_nick]
= f.input :nick -# use_nil option to user model validators break required mark
= f.input :nick, required: true
= f.input :first_name = f.input :first_name
= f.input :last_name = f.input :last_name
= f.input :email = f.input :email