diff --git a/app/controllers/admins/projects_rank_controller.rb b/app/controllers/admins/projects_rank_controller.rb index 8db0961b..9e7df34f 100644 --- a/app/controllers/admins/projects_rank_controller.rb +++ b/app/controllers/admins/projects_rank_controller.rb @@ -10,7 +10,7 @@ class Admins::ProjectsRankController < Admins::BaseController sum(issues) as issues, sum(pullrequests) as pullrequests, sum(commits) as commits").includes(:project) - @statistics = @statistics.order("#{sort_by} #{sort_direction}") + @statistics = paginate @statistics.order("#{sort_by} #{sort_direction}") export_excel(@statistics.limit(50)) end diff --git a/app/jobs/cache_async_clear_job.rb b/app/jobs/cache_async_clear_job.rb index 1d810781..589876bc 100644 --- a/app/jobs/cache_async_clear_job.rb +++ b/app/jobs/cache_async_clear_job.rb @@ -2,6 +2,7 @@ class CacheAsyncClearJob < ApplicationJob queue_as :cache def perform(type, id=nil) + return if id.nil? case type when "project_common_service" Cache::V2::ProjectCommonService.new(id).clear diff --git a/app/models/project.rb b/app/models/project.rb index c5fb448a..de57d88e 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -181,14 +181,14 @@ class Project < ApplicationRecord end if changes[:is_public].present? if changes[:is_public][0] && !changes[:is_public][1] - CacheAsyncClearJob.perform_later('project_rank_service', self.id) + CacheAsyncClearJob.set(wait: 5.seconds).perform_later('project_rank_service', self.id) end if !changes[:is_public][0] && changes[:is_public][1] $redis_cache.srem("v2-project-rank-deleted", self.id) end end if !self.common? - CacheAsyncClearJob.perform_later('project_rank_service', self.id) + CacheAsyncClearJob.set(wait: 5.seconds).perform_later('project_rank_service', self.id) end end diff --git a/app/views/admins/projects_rank/shared/_data_list.html.erb b/app/views/admins/projects_rank/shared/_data_list.html.erb index e95cfdef..1437a27c 100644 --- a/app/views/admins/projects_rank/shared/_data_list.html.erb +++ b/app/views/admins/projects_rank/shared/_data_list.html.erb @@ -34,4 +34,6 @@ <% end %> - \ No newline at end of file + + + <%= render partial: 'admins/shared/paginate', locals: { objects: statistics } %> \ No newline at end of file