Skip to content

Commit

Permalink
Fix expiration date of filters being set to “Never” when editing them (
Browse files Browse the repository at this point in the history
…#11204)

When editing a custom filter, select the shortest preset duration that
still covers the remaining time of that filter.

Fixes #9506
  • Loading branch information
ClearlyClaire authored and Gargron committed Aug 6, 2019
1 parent 0367ddb commit 5d79df0
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions app/models/custom_filter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,13 @@ class CustomFilter < ApplicationRecord
before_validation :clean_up_contexts
after_commit :remove_cache

def expires_in
return @expires_in if defined?(@expires_in)
return nil if expires_at.nil?

[30.minutes, 1.hour, 6.hours, 12.hours, 1.day, 1.week].find { |expires_in| expires_in.from_now >= expires_at }
end

private

def clean_up_contexts
Expand Down

0 comments on commit 5d79df0

Please sign in to comment.