Pagination for Merge Requests. Fixed for issues
This commit is contained in:
parent
755a894c91
commit
52d8ed9e4f
6 changed files with 24 additions and 17 deletions
|
@ -1,7 +1,12 @@
|
|||
- @issues.critical.each do |issue|
|
||||
- @issues.select(&:critical).each do |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})
|
||||
|
||||
%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 @@
|
|||
-# paginator: the paginator that renders the pagination tags inside
|
||||
= paginator.render do
|
||||
%nav.gitlab_pagination
|
||||
-#= first_page_tag unless current_page.first?
|
||||
= prev_page_tag
|
||||
- each_page do |page|
|
||||
- if page.left_outer? || page.right_outer? || page.inside_window?
|
||||
|
@ -15,4 +14,3 @@
|
|||
- elsif !page.was_truncated?
|
||||
= gap_tag
|
||||
= next_page_tag
|
||||
-#= last_page_tag unless current_page.last?
|
||||
|
|
|
@ -27,5 +27,10 @@
|
|||
- if @merge_requests.blank?
|
||||
%li
|
||||
%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
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue