diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 0ece8f227..7cf068cd5 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -287,7 +287,10 @@ class ProjectsController < ApplicationController end def watch_users + start_at = params[:start_at] + end_at = params[:end_at] watchers = @project.watchers.includes(:user).order("watchers.created_at desc").distinct + watchers = watchers.where("watchers.created_at > ? and watchers.created_at < ?", Time.at(start_at), Time.at(end_at)) if start_at.present? && end_at.present? @watchers_count = watchers.size @watchers = paginate(watchers) end