|
|
@ -128,9 +128,7 @@ class User < ApplicationRecord
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
def disable!
|
|
|
|
def disable!
|
|
|
|
update!(disabled: true,
|
|
|
|
update!(disabled: true)
|
|
|
|
last_sign_in_at: current_sign_in_at,
|
|
|
|
|
|
|
|
current_sign_in_at: nil)
|
|
|
|
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
def enable!
|
|
|
|
def enable!
|
|
|
@ -301,7 +299,7 @@ class User < ApplicationRecord
|
|
|
|
arr << [current_sign_in_at, current_sign_in_ip] if current_sign_in_ip.present?
|
|
|
|
arr << [current_sign_in_at, current_sign_in_ip] if current_sign_in_ip.present?
|
|
|
|
arr << [last_sign_in_at, last_sign_in_ip] if last_sign_in_ip.present?
|
|
|
|
arr << [last_sign_in_at, last_sign_in_ip] if last_sign_in_ip.present?
|
|
|
|
|
|
|
|
|
|
|
|
arr.sort_by(&:first).uniq(&:last).reverse!
|
|
|
|
arr.sort_by { |pair| pair.first || Time.now.utc }.uniq(&:last).reverse!
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|