merge with master

2015-10-08 15:26:33 +02:00
parent 26072eebeb 27f59f4aff
commit f7ac7a526d
9 changed files with 128 additions and 10 deletions
--- a/app/models/manager.rb
+++ b/app/models/manager.rb
@@ -4,9 +4,9 @@ class Manager < ActiveRecord::Base

  has_secure_password

-  def self.valid_auth?(username = nil, password = nil)
+  def self.valid_manager(username = nil, password = nil)
    return false unless username.present? && password.present?
-    Manager.find_by(username: username).try(:authenticate, password).present?
+    Manager.find_by(username: username).try(:authenticate, password)
  end

 end