consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2131 from wairbut-m2c/iagirre-budget-pagination-bug

Browse Source 
Iagirre budget pagination bug
This commit is contained in:
Raimond Garcia
2017-11-27 16:49:27 +01:00
committed by GitHub
parent 7a2fc7fbff d118566234
commit 778ddbee0f
3 changed files with 76 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/controllers/budgets/investments_controller.rb
View File

@@ -28,8 +28,8 @@ module Budgets
respond_to :html, :js
def index
@investments = @investments.apply_filters_and_search(@budget, params, @current_filter)
.send("sort_by_#{@current_order}").page(params[:page]).per(10).for_render
@investments = investments.page(params[:page]).per(10).for_render
@investment_ids = @investments.pluck(:id)
load_investment_votes(@investments)
@tag_cloud = tag_cloud
@@ -94,9 +94,8 @@ module Budgets
def set_random_seed
if params[:order] == 'random' || params[:order].blank?
params[:random_seed] ||= rand(99) / 100.0
seed = Float(params[:random_seed]) rescue 0
Budget::Investment.connection.execute("select setseed(#{seed})")
seed = rand(10..99) / 10.0
params[:random_seed] ||= Float(seed) rescue 0
else
params[:random_seed] = nil
end
@@ -131,6 +130,17 @@ module Budgets
TagCloud.new(Budget::Investment, params[:search])
end
def investments
case @current_order
when 'random'
@investments.apply_filters_and_search(@budget, params, @current_filter)
.send("sort_by_#{@current_order}", params[:random_seed])
else
@investments.apply_filters_and_search(@budget, params, @current_filter)
.send("sort_by_#{@current_order}")
end
end
end
end