bunch of fixes, need to refactoring to move state to the store in order to make it more fluxy

This commit is contained in:
Edin Dazdarevic
2015-03-19 22:29:16 +01:00
parent bc10740780
commit a7e40e579f
5 changed files with 93 additions and 213 deletions

View File

@@ -4,11 +4,13 @@ class User < ActiveRecord::Base
accepts_nested_attributes_for :children
has_secure_password
validates_presence_of :first_name, :last_name, :password, :email, :password_confirmation
has_secure_password :validations => false
validates :email, :uniqueness => {:case_sensitive => false, :message => "Email already exists!"},
format: { with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, message: "invalid email" }
validates :first_name, :presence =>{ :message => "Ime je obavezno polje." }
validates :last_name, :presence=>{ :message => "Prezime je obavezno polje." }
validates :password, confirmation: true, length: { in:6..20, too_short: 'password needs to be at least 6 characters long' }
validates :email, :uniqueness => {:case_sensitive => false, :message => "Već postoji registrovani korisnik sa email adresom koju ste unijeli."},
format: { with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, message: "Neispravna email adresa." }
validates :password, :confirmation => { :message=> "Šifre se ne podudaraju.", :on => :create }, length: { too_long:'Šifra mora biti manja od 20 karaktera.', in:6..20, too_short: 'Šifra mora biti minimalne dužine od 6 karaktera.' }
end