Merge pull request #91 from jtzemp/master
current_user.agents fails if current_user == nil
Andrew Cantino
1 changed files with 6 additions and 2 deletions
+ 6
- 2
app/views/layouts/application.html.erb
@@ -34,7 +34,11 @@ |
||
| 34 | 34 |
</div> |
| 35 | 35 |
|
| 36 | 36 |
<script> |
| 37 |
- var agentPaths = <%= Utils.jsonify(current_user.agents.inject({}) {|m, a| m[a.name] = agent_path(a) unless a.new_record?; m }) %>;
|
|
| 37 |
+ var agentPaths = {};
|
|
| 38 |
+ <% if current_user -%> |
|
| 39 |
+ var myAgents = <%= Utils.jsonify(current_user.agents.inject({}) {|m, a| m[a.name] = agent_path(a) unless a.new_record?; m }) %>;
|
|
| 40 |
+ $.extend(agentPaths, myAgents); |
|
| 41 |
+ <% end -%> |
|
| 38 | 42 |
agentPaths["All Agents Index"] = <%= Utils.jsonify agents_path %>; |
| 39 | 43 |
agentPaths["New Agent"] = <%= Utils.jsonify new_agent_path %>; |
| 40 | 44 |
agentPaths["Account"] = <%= Utils.jsonify edit_user_registration_path %>; |
@@ -45,4 +49,4 @@ |
||
| 45 | 49 |
$.each(agentPaths, function(name, v) { agentNames.push(name); });
|
| 46 | 50 |
</script> |
| 47 | 51 |
</body> |
| 48 |
-</html> |
|
| 52 |
+</html> |