Moved current_user to the application layout. Fixes #158

kandanapp · Mar 1, 2013 · 331bdc1 · 331bdc1
1 parent a8aece6
commit 331bdc1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -11,6 +11,12 @@
   <%= yield :javascript_includes %>
 
   <%= csrf_meta_tags %>
+
+  <%- if user_signed_in? %>
+    <%= javascript_tag do %>
+      $.data(document, "current-user", <%= current_user_data.to_json.html_safe %>);
+    <% end %>
+  <%- end %>
 </head>
 <body>
   <div id="kandan">

diff --git a/app/views/main/index.html.erb b/app/views/main/index.html.erb
@@ -9,9 +9,6 @@
 <%- end %>
   
 <%= javascript_tag do %>
-  <%- if user_signed_in? %>
-    $.data(document, "current-user", <%= current_user_data.to_json.html_safe %>);
-  <%- end %>
   $(document).data("active-users", [])
 <%- end %>
 

diff --git a/app/views/main/search.html.erb b/app/views/main/search.html.erb
@@ -1,6 +1,4 @@
 <%= javascript_tag do %>
-  $.data(document, "current-user", <%= current_user_data.to_json.html_safe %>);
-
   $(document).ready(function(){
     Kandan.Plugins.initAll()
     activities = <%= @activities.to_json(:include => :user).html_safe %>;