Allow filtered dashboard/explore results to be paged. Fixes #14104
This commit is contained in:
parent
60d0a20b3a
commit
449954ecc2
|
@ -24,6 +24,7 @@ v 8.6.0 (unreleased)
|
||||||
- Show labels in dashboard and group milestone views
|
- Show labels in dashboard and group milestone views
|
||||||
- Add main language of a project in the list of projects (Tiago Botelho)
|
- Add main language of a project in the list of projects (Tiago Botelho)
|
||||||
- Add ability to show archived projects on dashboard, explore and group pages
|
- Add ability to show archived projects on dashboard, explore and group pages
|
||||||
|
- Fix pagination for filtered dashboard and explore pages
|
||||||
|
|
||||||
v 8.5.5
|
v 8.5.5
|
||||||
- Ensure removing a project removes associated Todo entries.
|
- Ensure removing a project removes associated Todo entries.
|
||||||
|
|
|
@ -8,7 +8,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
|
||||||
@projects = filter_projects(@projects)
|
@projects = filter_projects(@projects)
|
||||||
@projects = @projects.includes(:namespace)
|
@projects = @projects.includes(:namespace)
|
||||||
@projects = @projects.sort(@sort = params[:sort])
|
@projects = @projects.sort(@sort = params[:sort])
|
||||||
@projects = @projects.page(params[:page]).per(PER_PAGE) if params[:filter_projects].blank?
|
@projects = @projects.page(params[:page]).per(PER_PAGE)
|
||||||
|
|
||||||
@last_push = current_user.recent_push
|
@last_push = current_user.recent_push
|
||||||
|
|
||||||
|
@ -32,7 +32,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
|
||||||
@projects = filter_projects(@projects)
|
@projects = filter_projects(@projects)
|
||||||
@projects = @projects.includes(:namespace, :forked_from_project, :tags)
|
@projects = @projects.includes(:namespace, :forked_from_project, :tags)
|
||||||
@projects = @projects.sort(@sort = params[:sort])
|
@projects = @projects.sort(@sort = params[:sort])
|
||||||
@projects = @projects.page(params[:page]).per(PER_PAGE) if params[:filter_projects].blank?
|
@projects = @projects.page(params[:page]).per(PER_PAGE)
|
||||||
|
|
||||||
@last_push = current_user.recent_push
|
@last_push = current_user.recent_push
|
||||||
@groups = []
|
@groups = []
|
||||||
|
|
|
@ -8,7 +8,7 @@ class Explore::ProjectsController < Explore::ApplicationController
|
||||||
@projects = @projects.where(visibility_level: params[:visibility_level]) if params[:visibility_level].present?
|
@projects = @projects.where(visibility_level: params[:visibility_level]) if params[:visibility_level].present?
|
||||||
@projects = filter_projects(@projects)
|
@projects = filter_projects(@projects)
|
||||||
@projects = @projects.sort(@sort = params[:sort])
|
@projects = @projects.sort(@sort = params[:sort])
|
||||||
@projects = @projects.includes(:namespace).page(params[:page]).per(PER_PAGE) if params[:filter_projects].blank?
|
@projects = @projects.includes(:namespace).page(params[:page]).per(PER_PAGE)
|
||||||
|
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
format.html
|
format.html
|
||||||
|
@ -23,7 +23,7 @@ class Explore::ProjectsController < Explore::ApplicationController
|
||||||
def trending
|
def trending
|
||||||
@projects = TrendingProjectsFinder.new.execute(current_user)
|
@projects = TrendingProjectsFinder.new.execute(current_user)
|
||||||
@projects = filter_projects(@projects)
|
@projects = filter_projects(@projects)
|
||||||
@projects = @projects.page(params[:page]).per(PER_PAGE) if params[:filter_projects].blank?
|
@projects = @projects.page(params[:page]).per(PER_PAGE)
|
||||||
|
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
format.html
|
format.html
|
||||||
|
@ -39,7 +39,7 @@ class Explore::ProjectsController < Explore::ApplicationController
|
||||||
@projects = ProjectsFinder.new.execute(current_user)
|
@projects = ProjectsFinder.new.execute(current_user)
|
||||||
@projects = filter_projects(@projects)
|
@projects = filter_projects(@projects)
|
||||||
@projects = @projects.reorder('star_count DESC')
|
@projects = @projects.reorder('star_count DESC')
|
||||||
@projects = @projects.page(params[:page]).per(PER_PAGE) if params[:filter_projects].blank?
|
@projects = @projects.page(params[:page]).per(PER_PAGE)
|
||||||
|
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
format.html
|
format.html
|
||||||
|
|
Loading…
Reference in New Issue