diff options
Diffstat (limited to 'app/services/resource_events')
| -rw-r--r-- | app/services/resource_events/base_change_timebox_service.rb | 2 | ||||
| -rw-r--r-- | app/services/resource_events/base_synthetic_notes_builder_service.rb | 9 |
2 files changed, 2 insertions, 9 deletions
diff --git a/app/services/resource_events/base_change_timebox_service.rb b/app/services/resource_events/base_change_timebox_service.rb index d802bbee107..372f1c9d816 100644 --- a/app/services/resource_events/base_change_timebox_service.rb +++ b/app/services/resource_events/base_change_timebox_service.rb @@ -22,7 +22,7 @@ module ResourceEvents end def build_resource_args - key = resource.class.name.foreign_key + key = resource.class.base_class.name.foreign_key { user_id: user.id, diff --git a/app/services/resource_events/base_synthetic_notes_builder_service.rb b/app/services/resource_events/base_synthetic_notes_builder_service.rb index 192d40129a3..36de70dc291 100644 --- a/app/services/resource_events/base_synthetic_notes_builder_service.rb +++ b/app/services/resource_events/base_synthetic_notes_builder_service.rb @@ -25,8 +25,7 @@ module ResourceEvents def apply_common_filters(events) events = apply_pagination(events) - events = apply_last_fetched_at(events) - apply_fetch_until(events) + apply_last_fetched_at(events) end def apply_pagination(events) @@ -44,12 +43,6 @@ module ResourceEvents events.created_after(last_fetched_at) end - def apply_fetch_until(events) - return events unless params[:fetch_until].present? - - events.created_on_or_before(params[:fetch_until]) - end - def resource_parent strong_memoize(:resource_parent) do resource.project || resource.group |