FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #35 from Retrospring/feature-fix-question-pages 

Fix question pagination
This commit is contained in:
Andreas N. 2015-07-26 09:25:03 +02:00
parent 6ea04faf4f 21f2467f45
commit a26f429124
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/views/shared/_question.html.haml
View File

@ -1,3 +1,4 @@
- type ||= nil
.panel.panel-default.questionbox{data: { id: q.id }} .panel.panel-default.questionbox{data: { id: q.id }}
.panel-body .panel-body
.media .media

4
app/views/user/questions.js.erb
View File

@ -1,8 +1,8 @@
$('#questions').append('<% @questions.each do |q| $('#questions').append('<% @questions.each do |q|
%><%= j render 'shared/question', q: q %><%= j render 'shared/question', q: q, type: nil
%><% end %>'); %><% end %>');
<% if @questions.next_page %> <% if @questions.next_page %>
$('#pagination').html('<%= j will_paginate @questions, renderer: BootstrapPagination::Rails, page_links: false %>'); $('#pagination').html('<%= j will_paginate @questions, renderer: BootstrapPagination::Rails, page_links: false %>');
<% else %> <% else %>
$('#pagination, #load-more-btn').remove(); $('#pagination, #load-more-btn').remove();
<% end %> <% end %>