diff options
| author | Yamagishi Kazutoshi <ykzts@desire.sh> | 2017-11-28 23:41:02 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-11-28 15:41:02 +0100 |
| commit | 15fab79cfa5b732e9d7816f162272d72cf06c733 (patch) | |
| tree | b98ae3561675f5cfc4af08f8d2e7fe338aecefbd /app/models | |
| parent | eeaec39888f66bf312ac9a4c58f315ffd8f874f2 (diff) | |
Show "expired" in invite index (#5838)
* Show "expired" in invite index * "Force expire" -> "Deactivate"
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/invite.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/invite.rb b/app/models/invite.rb index ceca04686..7626f4cfa 100644 --- a/app/models/invite.rb +++ b/app/models/invite.rb @@ -27,13 +27,17 @@ class Invite < ApplicationRecord end def valid_for_use? - (max_uses.nil? || uses < max_uses) && (expires_at.nil? || expires_at >= Time.now.utc) + (max_uses.nil? || uses < max_uses) && !expired? end def expire! touch(:expires_at) end + def expired? + !expires_at.nil? && expires_at < Time.now.utc + end + private def set_code |