Download as
Browse Code »

Commit d784759abb8c5b24f575b91974e478e8457010f5

Authored by Marcin Ciunelis
1 parent d8532968
Exists in master and in 1 other branch production

will_paginate replaced by kaminari in apps, errs and users

Showing 15 changed files with 83 additions and 13 deletions   Show diff stats
app/controllers/apps_controller.rb
  Diff comments   View file @d784759
@@ -15,7 +15,7 @@ class AppsController < InheritedResources::Base @@ -15,7 +15,7 @@ class AppsController < InheritedResources::Base
15 15
16 @problems = resource.problems 16 @problems = resource.problems
17 @problems = @problems.unresolved unless @all_errs 17 @problems = @problems.unresolved unless @all_errs
18 - @problems = @problems.in_env(params[:environment]).ordered_by(@sort, @order).paginate(:page => params[:page], :per_page => current_user.per_page) 18 + @problems = @problems.in_env(params[:environment]).ordered_by(@sort, @order).page(params[:page]).per(current_user.per_page)
19 19
20 @selected_problems = params[:problems] || [] 20 @selected_problems = params[:problems] || []
21 @deploys = @app.deploys.order_by(:created_at.desc).limit(5) 21 @deploys = @app.deploys.order_by(:created_at.desc).limit(5)
app/controllers/errs_controller.rb
  Diff comments   View file @d784759
@@ -16,7 +16,7 @@ class ErrsController < ApplicationController @@ -16,7 +16,7 @@ class ErrsController < ApplicationController
16 @selected_problems = params[:problems] || [] 16 @selected_problems = params[:problems] || []
17 respond_to do |format| 17 respond_to do |format|
18 format.html do 18 format.html do
19 - @problems = @problems.paginate(:page => params[:page], :per_page => current_user.per_page) 19 + @problems = @problems.page(params[:page]).per(current_user.per_page)
20 end 20 end
21 format.atom 21 format.atom
22 end 22 end
@@ -24,7 +24,7 @@ class ErrsController < ApplicationController @@ -24,7 +24,7 @@ class ErrsController < ApplicationController
24 24
25 def all 25 def all
26 app_scope = current_user.admin? ? App.all : current_user.apps 26 app_scope = current_user.admin? ? App.all : current_user.apps
27 - @problems = Problem.for_apps(app_scope).ordered.paginate(:page => params[:page], :per_page => current_user.per_page) 27 + @problems = Problem.for_apps(app_scope).ordered.page(params[:page]).per(current_user.per_page)
28 @selected_problems = params[:problems] || [] 28 @selected_problems = params[:problems] || []
29 end 29 end
30 30
app/controllers/users_controller.rb
  Diff comments   View file @d784759
@@ -6,7 +6,7 @@ class UsersController < ApplicationController @@ -6,7 +6,7 @@ class UsersController < ApplicationController
6 before_filter :require_user_edit_priviledges, :only => [:edit, :update] 6 before_filter :require_user_edit_priviledges, :only => [:edit, :update]
7 7
8 def index 8 def index
9 - @users = User.all.paginate(:page => params[:page], :per_page => current_user.per_page) 9 + @users = User.all.page(params[:page]).per(current_user.per_page)
10 end 10 end
11 11
12 def show 12 def show
app/views/errs/_table.html.haml
  Diff comments   View file @d784759
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 %tr 44 %tr
45 %td{:colspan => (@app ? 5 : 6)} 45 %td{:colspan => (@app ? 5 : 6)}
46 %em No errs here 46 %em No errs here
47 - = will_paginate @problems, :previous_label => '« Previous', :next_label => 'Next »' 47 + = paginate errs
48 .tab-bar 48 .tab-bar
49 %ul 49 %ul
50 %li= submit_tag 'Merge', :id => 'merge_errs', :class => 'button', 'data-action' => merge_several_errs_path 50 %li= submit_tag 'Merge', :id => 'merge_errs', :class => 'button', 'data-action' => merge_several_errs_path
app/views/kaminari/_first_page.html.haml 0 → 100644
  Diff comments   View file @d784759
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
  1 +-# Link to the "First" page
  2 +-# available local variables
  3 +-# url: url to the first page
  4 +-# current_page: a page object for the currently displayed page
  5 +-# num_pages: total number of pages
  6 +-# per_page: number of items to fetch per page
  7 +-# remote: data-remote
  8 +%span.first
  9 + = link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote
app/views/kaminari/_gap.html.haml 0 → 100644
  Diff comments   View file @d784759
@@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
  1 +-# Non-link tag that stands for skipped pages...
  2 +-# available local variables
  3 +-# current_page: a page object for the currently displayed page
  4 +-# num_pages: total number of pages
  5 +-# per_page: number of items to fetch per page
  6 +-# remote: data-remote
  7 +%span.page.gap
  8 + = raw(t 'views.pagination.truncate')
app/views/kaminari/_last_page.html.haml 0 → 100644
  Diff comments   View file @d784759
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
  1 +-# Link to the "Last" page
  2 +-# available local variables
  3 +-# url: url to the last page
  4 +-# current_page: a page object for the currently displayed page
  5 +-# num_pages: total number of pages
  6 +-# per_page: number of items to fetch per page
  7 +-# remote: data-remote
  8 +%span.last
  9 + = link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {:remote => remote}
app/views/kaminari/_next_page.html.haml 0 → 100644
  Diff comments   View file @d784759
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
  1 +-# Link to the "Next" page
  2 +-# available local variables
  3 +-# url: url to the next page
  4 +-# current_page: a page object for the currently displayed page
  5 +-# num_pages: total number of pages
  6 +-# per_page: number of items to fetch per page
  7 +-# remote: data-remote
  8 +%span.next
  9 + = link_to_unless current_page.last?, raw('Next »'), url, :rel => 'next'
app/views/kaminari/_page.html.haml 0 → 100644
  Diff comments   View file @d784759
@@ -0,0 +1,10 @@ @@ -0,0 +1,10 @@
  1 +-# Link showing page number
  2 +-# available local variables
  3 +-# page: a page object for "this" page
  4 +-# url: url to this page
  5 +-# current_page: a page object for the currently displayed page
  6 +-# num_pages: total number of pages
  7 +-# per_page: number of items to fetch per page
  8 +-# remote: data-remote
  9 +%span{:class => "page#{' current' if page.current?}"}
  10 + = link_to_unless page.current?, page, url, {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil}
app/views/kaminari/_paginator.html.haml 0 → 100644
  Diff comments   View file @d784759
@@ -0,0 +1,16 @@ @@ -0,0 +1,16 @@
  1 +-# The container tag
  2 +-# available local variables
  3 +-# current_page: a page object for the currently displayed page
  4 +-# num_pages: total number of pages
  5 +-# per_page: number of items to fetch per page
  6 +-# remote: data-remote
  7 +-# paginator: the paginator that renders the pagination tags inside
  8 += paginator.render do
  9 + %nav.pagination
  10 + = prev_page_tag
  11 + - each_page do |page|
  12 + - if page.left_outer? || page.right_outer? || page.inside_window?
  13 + = page_tag page
  14 + - elsif !page.was_truncated?
  15 + = gap_tag
  16 + = next_page_tag
app/views/kaminari/_prev_page.html.haml 0 → 100644
  Diff comments   View file @d784759
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
  1 +-# Link to the "Previous" page
  2 +-# available local variables
  3 +-# url: url to the previous page
  4 +-# current_page: a page object for the currently displayed page
  5 +-# num_pages: total number of pages
  6 +-# per_page: number of items to fetch per page
  7 +-# remote: data-remote
  8 +%span.prev
  9 + = link_to_unless current_page.first?, raw('« Previous'), url, :rel => 'prev'
app/views/users/index.html.haml
  Diff comments   View file @d784759
@@ -18,5 +18,5 @@ @@ -18,5 +18,5 @@
18 %td= user.username 18 %td= user.username
19 %td= user.email 19 %td= user.email
20 %td= user.admin? ? 'Y' : 'N' 20 %td= user.admin? ? 'Y' : 'N'
21 -= will_paginate @users, :previous_label => '« Previous', :next_label => 'Next »' 21 += paginate @users
22 22
spec/controllers/apps_controller_spec.rb
  Diff comments   View file @d784759
@@ -65,13 +65,13 @@ describe AppsController do @@ -65,13 +65,13 @@ describe AppsController do
65 65
66 it "should have default per_page value for user" do 66 it "should have default per_page value for user" do
67 get :show, :id => @app.id 67 get :show, :id => @app.id
68 - assigns(:problems).size.should == User::PER_PAGE 68 + assigns(:problems).to_a.size.should == User::PER_PAGE
69 end 69 end
70 70
71 it "should be able to override default per_page value" do 71 it "should be able to override default per_page value" do
72 @user.update_attribute :per_page, 10 72 @user.update_attribute :per_page, 10
73 get :show, :id => @app.id 73 get :show, :id => @app.id
74 - assigns(:problems).size.should == 10 74 + assigns(:problems).to_a.size.should == 10
75 end 75 end
76 end 76 end
77 77
spec/controllers/errs_controller_spec.rb
  Diff comments   View file @d784759
@@ -39,13 +39,13 @@ describe ErrsController do @@ -39,13 +39,13 @@ describe ErrsController do
39 39
40 it "should have default per_page value for user" do 40 it "should have default per_page value for user" do
41 get :index 41 get :index
42 - assigns(:problems).size.should == User::PER_PAGE 42 + assigns(:problems).to_a.size.should == User::PER_PAGE
43 end 43 end
44 44
45 it "should be able to override default per_page value" do 45 it "should be able to override default per_page value" do
46 @user.update_attribute :per_page, 10 46 @user.update_attribute :per_page, 10
47 get :index 47 get :index
48 - assigns(:problems).size.should == 10 48 + assigns(:problems).to_a.size.should == 10
49 end 49 end
50 end 50 end
51 51
@@ -111,11 +111,11 @@ describe ErrsController do @@ -111,11 +111,11 @@ describe ErrsController do
111 context 'when logged in as an admin' do 111 context 'when logged in as an admin' do
112 it "gets a paginated list of all errs" do 112 it "gets a paginated list of all errs" do
113 sign_in Factory(:admin) 113 sign_in Factory(:admin)
114 - errs = WillPaginate::Collection.new(1,30) 114 + errs = Kaminari.paginate_array((1..30).to_a)
115 3.times { errs << Factory(:err).problem } 115 3.times { errs << Factory(:err).problem }
116 3.times { errs << Factory(:err, :problem => Factory(:problem, :resolved => true)).problem } 116 3.times { errs << Factory(:err, :problem => Factory(:problem, :resolved => true)).problem }
117 Problem.should_receive(:ordered).and_return( 117 Problem.should_receive(:ordered).and_return(
118 - mock('proxy', :paginate => errs) 118 + mock('proxy', :page => mock('other_proxy', :per => errs))
119 ) 119 )
120 get :all 120 get :all
121 assigns(:problems).should == errs 121 assigns(:problems).should == errs
spec/controllers/users_controller_spec.rb
  Diff comments   View file @d784759
@@ -100,7 +100,7 @@ describe UsersController do @@ -100,7 +100,7 @@ describe UsersController do
100 @user.update_attribute :per_page, 2 100 @user.update_attribute :per_page, 2
101 users = 3.times { Factory(:user) } 101 users = 3.times { Factory(:user) }
102 get :index 102 get :index
103 - assigns(:users).size.should == 2 103 + assigns(:users).to_a.size.should == 2
104 end 104 end
105 end 105 end
106 106