Commit 52d8ed9e authored by randx's avatar randx

Pagination for Merge Requests. Fixed for issues

parent 755a894c
...@@ -476,8 +476,7 @@ img.lil_av { ...@@ -476,8 +476,7 @@ img.lil_av {
} }
} }
&.bottom { .bottom {
padding: 0 10px;
background:#f5f5f5; background:#f5f5f5;
border-top: 1px solid #eee; border-top: 1px solid #eee;
@include round-borders-bottom(4px); @include round-borders-bottom(4px);
...@@ -1029,11 +1028,11 @@ p.time { ...@@ -1029,11 +1028,11 @@ p.time {
} }
.gitlab_pagination { .gitlab_pagination {
span { span a { color:$link_color; }
padding:0 10px; .prev, .next, .current, .page a {
padding:10px;
a {
color:$link_color;
} }
.current {
border-bottom:2px solid $style_color;
} }
} }
...@@ -28,9 +28,9 @@ class IssuesController < ApplicationController ...@@ -28,9 +28,9 @@ class IssuesController < ApplicationController
when 2 then @project.issues.closed when 2 then @project.issues.closed
when 3 then @project.issues.opened.assigned(current_user) when 3 then @project.issues.opened.assigned(current_user)
else @project.issues.opened else @project.issues.opened
end.page(params[:page]).per(10) end.page(params[:page]).per(20)
@issues = @issues.includes(:author, :project) @issues = @issues.includes(:author, :project).order("critical, updated_at")
respond_to do |format| respond_to do |format|
format.html # index.html.erb format.html # index.html.erb
......
...@@ -28,7 +28,7 @@ class MergeRequestsController < ApplicationController ...@@ -28,7 +28,7 @@ class MergeRequestsController < ApplicationController
when 2 then @merge_requests.closed when 2 then @merge_requests.closed
when 3 then @merge_requests.opened.assigned(current_user) when 3 then @merge_requests.opened.assigned(current_user)
else @merge_requests.opened else @merge_requests.opened
end end.page(params[:page]).per(20)
@merge_requests = @merge_requests.includes(:author, :project).order("created_at desc") @merge_requests = @merge_requests.includes(:author, :project).order("created_at desc")
end end
......
- @issues.critical.each do |issue| - @issues.select(&:critical).each do |issue|
= render(:partial => 'issues/show', :locals => {:issue => issue}) = render(:partial => 'issues/show', :locals => {:issue => issue})
- @issues.non_critical.each do |issue| - @issues.reject(&:critical).each do |issue|
= render(:partial => 'issues/show', :locals => {:issue => issue}) = render(:partial => 'issues/show', :locals => {:issue => issue})
%li= paginate @issues, :remote => true, :theme => "gitlab" - if @issues.present?
%li.bottom
.row
.span10= paginate @issues, :remote => true, :theme => "gitlab"
.span4.right
%span.cgray.right #{@issues.total_count} issues for this filter
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
-# paginator: the paginator that renders the pagination tags inside -# paginator: the paginator that renders the pagination tags inside
= paginator.render do = paginator.render do
%nav.gitlab_pagination %nav.gitlab_pagination
-#= first_page_tag unless current_page.first?
= prev_page_tag = prev_page_tag
- each_page do |page| - each_page do |page|
- if page.left_outer? || page.right_outer? || page.inside_window? - if page.left_outer? || page.right_outer? || page.inside_window?
...@@ -15,4 +14,3 @@ ...@@ -15,4 +14,3 @@
- elsif !page.was_truncated? - elsif !page.was_truncated?
= gap_tag = gap_tag
= next_page_tag = next_page_tag
-#= last_page_tag unless current_page.last?
...@@ -27,5 +27,10 @@ ...@@ -27,5 +27,10 @@
- if @merge_requests.blank? - if @merge_requests.blank?
%li %li
%p.padded Nothing to show here %p.padded Nothing to show here
- if @merge_requests.present?
%li.bottom
.row
.span10= paginate @merge_requests, :theme => "gitlab"
.span4.right
%span.cgray.right #{@merge_requests.total_count} merge requests for this filter
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