From 070946e879872de609524b6434cc170207cada12 Mon Sep 17 00:00:00 2001 From: Dominik Sander Date: Tue, 27 Dec 2016 23:35:29 +0100 Subject: [PATCH] Work around possible regression in rails `pluck` used to always trigger a database query. With Rails 5.0.1 it uses data from already loaded associations, this also includes new records for which we can not generate agent_paths --- app/views/layouts/application.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 561f9a94..69f81378 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -52,7 +52,7 @@ window.agentPaths = {}; window.agentNames = []; <% if current_user.present? -%> - var myAgents = <%= Utils.jsonify(current_user.agents.pluck(:name, :id).inject({}) {|m, a| m[a.first] = agent_path(a.last); m }) %>; + var myAgents = <%= Utils.jsonify(current_user.agents.pluck(:name, :id).inject({}) {|m, a| next if a.last.nil?; m[a.first] = agent_path(a.last); m }) %>; var myScenarios = <%= Utils.jsonify(current_user.scenarios.pluck(:name, :id).inject({}) {|m, s| m[s.first + " Scenario"] = scenario_path(s.last); m }) %>; $.extend(window.agentPaths, myAgents); $.extend(window.agentPaths, myScenarios);