diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 4724224e8..0ece8f227 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -293,7 +293,10 @@ class ProjectsController < ApplicationController end def praise_users + start_at = params[:start_at] + end_at = params[:end_at] praises = @project.praise_treads.includes(:user).order("praise_treads.created_at desc").distinct + praises = praises.where("praise_treads.created_at > ? and praise_treads.created_at < ?", Time.at(start_at), Time.at(end_at)) if start_at.present? && end_at.present? @praises_count = praises.size @praises = paginate(praises) end diff --git a/app/controllers/watchers_controller.rb b/app/controllers/watchers_controller.rb index aa3642616..81ba7ceda 100644 --- a/app/controllers/watchers_controller.rb +++ b/app/controllers/watchers_controller.rb @@ -5,7 +5,10 @@ class WatchersController < ApplicationController before_action :get_target def index + start_at = params[:start_at] + end_at = params[:end_at] scope = @target.watchers.includes(:user) + scope = scope.where("watchers.created_at > ? and watchers.created_at < ?", Time.at(start_at), Time.at(end_at)) if start_at.present? && end_at.present? @watchers = paginate(scope) end