Commit fdfa79a7 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'default-pagination' into 'master'

Use same constant for amount of items per page

See merge request !1689
parents 2fe69158 f0cbbd70
...@@ -5,12 +5,12 @@ class Admin::GroupsController < Admin::ApplicationController ...@@ -5,12 +5,12 @@ class Admin::GroupsController < Admin::ApplicationController
@groups = Group.all @groups = Group.all
@groups = @groups.sort(@sort = params[:sort]) @groups = @groups.sort(@sort = params[:sort])
@groups = @groups.search(params[:name]) if params[:name].present? @groups = @groups.search(params[:name]) if params[:name].present?
@groups = @groups.page(params[:page]).per(20) @groups = @groups.page(params[:page]).per(PER_PAGE)
end end
def show def show
@members = @group.members.order("access_level DESC").page(params[:members_page]).per(30) @members = @group.members.order("access_level DESC").page(params[:members_page]).per(PER_PAGE)
@projects = @group.projects.page(params[:projects_page]).per(30) @projects = @group.projects.page(params[:projects_page]).per(PER_PAGE)
end end
def new def new
......
...@@ -11,15 +11,15 @@ class Admin::ProjectsController < Admin::ApplicationController ...@@ -11,15 +11,15 @@ class Admin::ProjectsController < Admin::ApplicationController
@projects = @projects.abandoned if params[:abandoned].present? @projects = @projects.abandoned if params[:abandoned].present?
@projects = @projects.search(params[:name]) if params[:name].present? @projects = @projects.search(params[:name]) if params[:name].present?
@projects = @projects.sort(@sort = params[:sort]) @projects = @projects.sort(@sort = params[:sort])
@projects = @projects.includes(:namespace).order("namespaces.path, projects.name ASC").page(params[:page]).per(20) @projects = @projects.includes(:namespace).order("namespaces.path, projects.name ASC").page(params[:page]).per(PER_PAGE)
end end
def show def show
if @group if @group
@group_members = @group.members.order("access_level DESC").page(params[:group_members_page]).per(30) @group_members = @group.members.order("access_level DESC").page(params[:group_members_page]).per(PER_PAGE)
end end
@project_members = @project.project_members.page(params[:project_members_page]).per(30) @project_members = @project.project_members.page(params[:project_members_page]).per(PER_PAGE)
end end
def transfer def transfer
......
...@@ -4,6 +4,8 @@ class ApplicationController < ActionController::Base ...@@ -4,6 +4,8 @@ class ApplicationController < ActionController::Base
include Gitlab::CurrentSettings include Gitlab::CurrentSettings
include GitlabRoutingHelper include GitlabRoutingHelper
PER_PAGE = 20
before_filter :authenticate_user_from_token! before_filter :authenticate_user_from_token!
before_filter :authenticate_user! before_filter :authenticate_user!
before_filter :reject_blocked! before_filter :reject_blocked!
......
class Dashboard::GroupsController < ApplicationController class Dashboard::GroupsController < ApplicationController
def index def index
@user_groups = current_user.group_members.page(params[:page]).per(20) @user_groups = current_user.group_members.page(params[:page]).per(PER_PAGE)
end end
def leave def leave
......
...@@ -8,7 +8,7 @@ class Dashboard::MilestonesController < ApplicationController ...@@ -8,7 +8,7 @@ class Dashboard::MilestonesController < ApplicationController
else state('active') else state('active')
end end
@dashboard_milestones = Milestones::GroupService.new(project_milestones).execute @dashboard_milestones = Milestones::GroupService.new(project_milestones).execute
@dashboard_milestones = Kaminari.paginate_array(@dashboard_milestones).page(params[:page]).per(30) @dashboard_milestones = Kaminari.paginate_array(@dashboard_milestones).page(params[:page]).per(PER_PAGE)
end end
def show def show
......
...@@ -25,13 +25,13 @@ class DashboardController < ApplicationController ...@@ -25,13 +25,13 @@ class DashboardController < ApplicationController
def merge_requests def merge_requests
@merge_requests = get_merge_requests_collection @merge_requests = get_merge_requests_collection
@merge_requests = @merge_requests.page(params[:page]).per(20) @merge_requests = @merge_requests.page(params[:page]).per(PER_PAGE)
@merge_requests = @merge_requests.preload(:author, :target_project) @merge_requests = @merge_requests.preload(:author, :target_project)
end end
def issues def issues
@issues = get_issues_collection @issues = get_issues_collection
@issues = @issues.page(params[:page]).per(20) @issues = @issues.page(params[:page]).per(PER_PAGE)
@issues = @issues.preload(:author, :project) @issues = @issues.preload(:author, :project)
respond_to do |format| respond_to do |format|
......
...@@ -8,6 +8,6 @@ class Explore::GroupsController < ApplicationController ...@@ -8,6 +8,6 @@ class Explore::GroupsController < ApplicationController
@groups = GroupsFinder.new.execute(current_user) @groups = GroupsFinder.new.execute(current_user)
@groups = @groups.search(params[:search]) if params[:search].present? @groups = @groups.search(params[:search]) if params[:search].present?
@groups = @groups.sort(@sort = params[:sort]) @groups = @groups.sort(@sort = params[:sort])
@groups = @groups.page(params[:page]).per(20) @groups = @groups.page(params[:page]).per(PER_PAGE)
end end
end end
...@@ -11,17 +11,17 @@ class Explore::ProjectsController < ApplicationController ...@@ -11,17 +11,17 @@ class Explore::ProjectsController < 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 = @projects.search(params[:search]) if params[:search].present? @projects = @projects.search(params[:search]) if params[:search].present?
@projects = @projects.sort(@sort = params[:sort]) @projects = @projects.sort(@sort = params[:sort])
@projects = @projects.includes(:namespace).page(params[:page]).per(20) @projects = @projects.includes(:namespace).page(params[:page]).per(PER_PAGE)
end end
def trending def trending
@trending_projects = TrendingProjectsFinder.new.execute(current_user) @trending_projects = TrendingProjectsFinder.new.execute(current_user)
@trending_projects = @trending_projects.page(params[:page]).per(10) @trending_projects = @trending_projects.page(params[:page]).per(PER_PAGE)
end end
def starred def starred
@starred_projects = ProjectsFinder.new.execute(current_user) @starred_projects = ProjectsFinder.new.execute(current_user)
@starred_projects = @starred_projects.reorder('star_count DESC') @starred_projects = @starred_projects.reorder('star_count DESC')
@starred_projects = @starred_projects.page(params[:page]).per(10) @starred_projects = @starred_projects.page(params[:page]).per(PER_PAGE)
end end
end end
...@@ -10,7 +10,7 @@ class Groups::MilestonesController < ApplicationController ...@@ -10,7 +10,7 @@ class Groups::MilestonesController < ApplicationController
else state('active') else state('active')
end end
@group_milestones = Milestones::GroupService.new(project_milestones).execute @group_milestones = Milestones::GroupService.new(project_milestones).execute
@group_milestones = Kaminari.paginate_array(@group_milestones).page(params[:page]).per(30) @group_milestones = Kaminari.paginate_array(@group_milestones).page(params[:page]).per(PER_PAGE)
end end
def show def show
......
...@@ -52,13 +52,13 @@ class GroupsController < Groups::ApplicationController ...@@ -52,13 +52,13 @@ class GroupsController < Groups::ApplicationController
def merge_requests def merge_requests
@merge_requests = get_merge_requests_collection @merge_requests = get_merge_requests_collection
@merge_requests = @merge_requests.page(params[:page]).per(20) @merge_requests = @merge_requests.page(params[:page]).per(PER_PAGE)
@merge_requests = @merge_requests.preload(:author, :target_project) @merge_requests = @merge_requests.preload(:author, :target_project)
end end
def issues def issues
@issues = get_issues_collection @issues = get_issues_collection
@issues = @issues.page(params[:page]).per(20) @issues = @issues.page(params[:page]).per(PER_PAGE)
@issues = @issues.preload(:author, :project) @issues = @issues.preload(:author, :project)
respond_to do |format| respond_to do |format|
......
...@@ -43,7 +43,7 @@ class ProfilesController < ApplicationController ...@@ -43,7 +43,7 @@ class ProfilesController < ApplicationController
end end
def history def history
@events = current_user.recent_events.page(params[:page]).per(20) @events = current_user.recent_events.page(params[:page]).per(PER_PAGE)
end end
def update_username def update_username
......
...@@ -8,7 +8,7 @@ class Projects::BranchesController < Projects::ApplicationController ...@@ -8,7 +8,7 @@ class Projects::BranchesController < Projects::ApplicationController
def index def index
@sort = params[:sort] || 'name' @sort = params[:sort] || 'name'
@branches = @repository.branches_sorted_by(@sort) @branches = @repository.branches_sorted_by(@sort)
@branches = Kaminari.paginate_array(@branches).page(params[:page]).per(30) @branches = Kaminari.paginate_array(@branches).page(params[:page]).per(PER_PAGE)
end end
def recent def recent
......
...@@ -20,7 +20,7 @@ class Projects::IssuesController < Projects::ApplicationController ...@@ -20,7 +20,7 @@ class Projects::IssuesController < Projects::ApplicationController
terms = params['issue_search'] terms = params['issue_search']
@issues = get_issues_collection @issues = get_issues_collection
@issues = @issues.full_search(terms) if terms.present? @issues = @issues.full_search(terms) if terms.present?
@issues = @issues.page(params[:page]).per(20) @issues = @issues.page(params[:page]).per(PER_PAGE)
respond_to do |format| respond_to do |format|
format.html format.html
......
...@@ -7,7 +7,7 @@ class Projects::LabelsController < Projects::ApplicationController ...@@ -7,7 +7,7 @@ class Projects::LabelsController < Projects::ApplicationController
respond_to :js, :html respond_to :js, :html
def index def index
@labels = @project.labels.page(params[:page]).per(20) @labels = @project.labels.page(params[:page]).per(PER_PAGE)
end end
def new def new
......
...@@ -18,7 +18,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController ...@@ -18,7 +18,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
def index def index
@merge_requests = get_merge_requests_collection @merge_requests = get_merge_requests_collection
@merge_requests = @merge_requests.page(params[:page]).per(20) @merge_requests = @merge_requests.page(params[:page]).per(PER_PAGE)
end end
def show def show
......
...@@ -18,7 +18,7 @@ class Projects::MilestonesController < Projects::ApplicationController ...@@ -18,7 +18,7 @@ class Projects::MilestonesController < Projects::ApplicationController
end end
@milestones = @milestones.includes(:project) @milestones = @milestones.includes(:project)
@milestones = @milestones.page(params[:page]).per(20) @milestones = @milestones.page(params[:page]).per(PER_PAGE)
end end
def new def new
......
...@@ -7,7 +7,7 @@ class Projects::TagsController < Projects::ApplicationController ...@@ -7,7 +7,7 @@ class Projects::TagsController < Projects::ApplicationController
def index def index
sorted = VersionSorter.rsort(@repository.tag_names) sorted = VersionSorter.rsort(@repository.tag_names)
@tags = Kaminari.paginate_array(sorted).page(params[:page]).per(30) @tags = Kaminari.paginate_array(sorted).page(params[:page]).per(PER_PAGE)
end end
def create def create
......
...@@ -7,7 +7,7 @@ class Projects::WikisController < Projects::ApplicationController ...@@ -7,7 +7,7 @@ class Projects::WikisController < Projects::ApplicationController
before_filter :load_project_wiki before_filter :load_project_wiki
def pages def pages
@wiki_pages = Kaminari.paginate_array(@project_wiki.pages).page(params[:page]).per(30) @wiki_pages = Kaminari.paginate_array(@project_wiki.pages).page(params[:page]).per(PER_PAGE)
end end
def show def show
......
...@@ -16,7 +16,7 @@ class SnippetsController < ApplicationController ...@@ -16,7 +16,7 @@ class SnippetsController < ApplicationController
layout :determine_layout layout :determine_layout
def index def index
@snippets = SnippetsFinder.new.execute(current_user, filter: :all).page(params[:page]).per(20) @snippets = SnippetsFinder.new.execute(current_user, filter: :all).page(params[:page]).per(PER_PAGE)
end end
def user_index def user_index
...@@ -28,7 +28,7 @@ class SnippetsController < ApplicationController ...@@ -28,7 +28,7 @@ class SnippetsController < ApplicationController
filter: :by_user, filter: :by_user,
user: @user, user: @user,
scope: params[:scope] }). scope: params[:scope] }).
page(params[:page]).per(20) page(params[:page]).per(PER_PAGE)
if @user == current_user if @user == current_user
render 'current_user_index' render 'current_user_index'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment