Merge branch 'release/0.17.9.11'

ulmic · Apr 26, 2017 · 4cd223c · 4cd223c
2 parents f5b0856 + 7766e84
commit 4cd223c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/app/controllers/web/sessions_controller.rb b/app/controllers/web/sessions_controller.rb
@@ -6,7 +6,7 @@ def new
   end
 
   def create
-    @user = User.find_by_email params[:user][:email]
+    @user = User.find_by_email params[:user][:email].downcase
     if @user
       if @user.password_digest.present? && @user.authenticate(params[:user][:password]) 
 	if @user.has_access?

diff --git a/app/models/member.rb b/app/models/member.rb
@@ -20,20 +20,19 @@ class Member < User
   has_many :views, as: :record, foreign_key: :record_id, class_name: 'View'
 
 
-  #validates :email, uniqueness: true
   validates :first_name, human_name: true,
                          allow_blank: true
   validates :last_name, human_name: true,
                         allow_blank: true
   validates :patronymic, human_name: true,
                          allow_blank: true
-  #validates :ticket, uniqueness: { scope: :state },
-  #                   allow_blank: true
+  validates :ticket, uniqueness: { scope: :state },
+                     allow_blank: true
   validates :mobile_phone, phone: true,
                            allow_blank: true
   validates :motto, uniqueness: true,
                     allow_blank: true
-  #validates :avatar, presence: true, if: Proc.new { state != "unavailable" && state != "corrupted_email" }
+  validates :avatar, presence: true, if: Proc.new { state != "unavailable" && state != "corrupted_email" }
   validates :corporate_email, ulmic_email: true,
                               email: true,
                               uniqueness: true,

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -21,7 +21,9 @@ class User < ActiveRecord::Base
   has_many :tokens, as: :record
 
   validates :email, email: true,
-                    allow_blank: true
+                    allow_blank: true,
+                    uniqueness: true,
+                    allow_nil: true
   validates :first_name, human_name: true,
                          allow_blank: true
   validates :last_name, human_name: true,