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

Merge branch 'master' into admin-newsletter-emails

Browse Source
This commit is contained in:
María Checa
2018-02-14 16:07:13 +01:00
parent 20de8c81f7 8bec36500a
commit 24bca36639
35 changed files with 559 additions and 897 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/budget_investments_controller.rb
View File

@@ -101,7 +101,7 @@ class Admin::BudgetInvestmentsController < Admin::BaseController
end
def load_investment
@investment = Budget::Investment.where(budget_id: @budget.id).find(params[:id])
@investment = Budget::Investment.by_budget(@budget).find(params[:id])
end
def load_admins

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

@@ -95,7 +95,7 @@ module Budgets
def set_random_seed
if params[:order] == 'random' || params[:order].blank?
seed = rand(-100..100) / 100.0
seed = params[:random_seed] || session[:random_seed] || rand(-100000..100000)
params[:random_seed] ||= Float(seed) rescue 0
else
params[:random_seed] = nil