meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

Don't compare timestamps with 0, triggers SQL errors with PostgreSQL (#10840).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@16175 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2017-01-12 22:20:46 +00:00
parent 5d4b5fd1f6
commit 82d96258f4
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/models/token.rb
View File

@ -48,7 +48,8 @@ class Token < ActiveRecord::Base
# Return true if token has expired
def expired?
return created_on < self.class.invalid_when_created_before(action)
validity_time = self.class.invalid_when_created_before(action)
validity_time.present? && created_on < validity_time
end
def max_instances
@ -63,9 +64,7 @@ class Token < ActiveRecord::Base
validity_time = self.validity_time
end
if validity_time.nil?
0
else
if validity_time
Time.now - validity_time
end
end