git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove paginate in surveys

Browse Source
This commit is contained in:
phyusin
2018-05-23 17:55:17 +06:30
parent 3a93830c94
commit ed8f9978b6
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/transactions/surveys_controller.rb
View File

@@ -5,15 +5,9 @@ class Transactions::SurveysController < ApplicationController
to = params[:to] to = params[:to]
if filter.nil? && from.nil? && to.nil? if filter.nil? && from.nil? && to.nil?
surveys = Survey.all @surveys = Survey.all
else else
surveys = Survey.search(filter,from,to) @surveys = Survey.search(filter,from,to)
end
if !surveys.nil?
@surveys = Kaminari.paginate_array(surveys).page(params[:page]).per(20)
else
@surveys = []
end end
@filter = filter @filter = filter

3
app/views/transactions/surveys/index.html.erb
View File

@@ -93,9 +93,6 @@
</tbody> </tbody>
</table> </table>
<br> <br>
<%if !@orders.nil?%>
<%= paginate @surveys %>
<%end%>
</div> </div>
</div> </div>
</div> </div>