Skip to content

Commit

Permalink
Pagination bug fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
Andris authored and Andris committed Jan 14, 2015
1 parent 69f386a commit eeba5f1
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion app/views/admin/groups/index.html.haml
Expand Up @@ -15,4 +15,4 @@
- else
= render "shared/empty"

#paginate= render "shared/paginate"
#paginate= render "shared/paginate_simple"
2 changes: 1 addition & 1 deletion app/views/admin/groups/index.js.haml
@@ -1,2 +1,2 @@
$('#groups').html('#{ j render(:partial => "admin/groups/group", :collection => @groups) }');
$('#paginate').html('#{ j render(:partial => "shared/paginate") }')
$('#paginate').html('#{ j render(:partial => "shared/paginate_simple") }')
2 changes: 1 addition & 1 deletion app/views/admin/users/index.html.haml
Expand Up @@ -9,5 +9,5 @@
.remote#create_user{ hidden }

.list#users= render :partial => "admin/users/user", :collection => @users
#paginate= render "shared/paginate"
#paginate= render "shared/paginate_simple"
#export= render "shared/export"
2 changes: 1 addition & 1 deletion app/views/admin/users/index.js.haml
@@ -1,2 +1,2 @@
$('#users').html('#{ j render(:partial => "admin/users/user", :collection => @users) }');
$('#paginate').html('#{ j render(:partial => "shared/paginate") }')
$('#paginate').html('#{ j render(:partial => "shared/paginate_simple") }')
2 changes: 1 addition & 1 deletion app/views/home/index.js.haml
Expand Up @@ -3,5 +3,5 @@
- else
$('#activities').html('#{ j t(:no_activity_records) }');

-# $('#paginate').html('#{ j render(:partial => "shared/paginate") }');
-# $('#paginate').html('#{ j render(:partial => "shared/paginate_simple") }');
$('#export').html('#{ j render(:partial => "shared/export") }');
@@ -1,2 +1,4 @@
= image_tag("loading.gif", size: 'thumb', class: "spinner", style: "display: none;")
= paginate


2 changes: 1 addition & 1 deletion spec/views/admin/users/index.haml_spec.rb
Expand Up @@ -15,7 +15,7 @@

render
view.should render_template(:partial => "_user")
view.should render_template(:partial => "shared/_paginate")
view.should render_template(:partial => "shared/_paginate_simple")
end
end

0 comments on commit eeba5f1

Please sign in to comment.