[myexperiment-hackers] [1932] branches/event_logging/app/views: News generation.

[noreply]

Revision

1932

Author

alekses6

Date

2008-11-07 13:02:32 -0500 (Fri, 07 Nov 2008)

Log Message

News generation. Fix for the previous commit - caching now implemented properly for anonymous (not logged in) users; now it doesn't interfere with caching for logged in users.

Modified Paths

• branches/event_logging/app/views/networks/show.rhtml
• branches/event_logging/app/views/users/show.rhtml

Diff

Modified: branches/event_logging/app/views/networks/show.rhtml (1931 => 1932)

--- branches/event_logging/app/views/networks/show.rhtml	2008-11-07 16:53:43 UTC (rev 1931)
+++ branches/event_logging/app/views/networks/show.rhtml	2008-11-07 18:02:32 UTC (rev 1932)
@@ -150,7 +150,8 @@
   <div class="tabTitle">News</div>
   <div class="tabContent">  
     <% benchmark "Group page news feed" do %>
-      <% cache_timeout({ :controller => 'news', :action ="" 'network_profile', :id => @network.id, :viewer => current_user.id } , NEWS_CACHE_TIMEOUT.seconds.from_now ) do -%>
+      <% viewer_id = (logged_in? ? current_user.id : nil) -%>
+			<% cache_timeout({ :controller => 'news', :action ="" 'network_profile', :id => @network.id, :viewer => viewer_id } , NEWS_CACHE_TIMEOUT.seconds.from_now ) do -%>
 			  <%= render :partial => "layouts/news", :locals => { :collection => news(@network, true, Time.now, Time.now-DEFAULT_GROUP_NEWS_TIMEFRAME, DEFAULT_GROUP_NEWS_COUNT, current_user) } %>
       <% end -%>
 		<% end %>

Modified: branches/event_logging/app/views/users/show.rhtml (1931 => 1932)

--- branches/event_logging/app/views/users/show.rhtml	2008-11-07 16:53:43 UTC (rev 1931)
+++ branches/event_logging/app/views/users/show.rhtml	2008-11-07 18:02:32 UTC (rev 1932)
@@ -354,7 +354,8 @@
 
   <% case @tab; when "News" %>
     <% benchmark "User profile page news feed" do %>
-      <% cache_timeout({ :controller => 'news', :action ="" 'user_profile', :id => @user.id, :viewer => current_user.id } , NEWS_CACHE_TIMEOUT.seconds.from_now ) do -%>
+      <% viewer_id = (logged_in? ? current_user.id : nil) -%>
+			<% cache_timeout({ :controller => 'news', :action ="" 'user_profile', :id => @user.id, :viewer => viewer_id } , NEWS_CACHE_TIMEOUT.seconds.from_now ) do -%>
   			<%= render :partial => "layouts/news", :locals => { :collection => news(@user, true, Time.now, Time.now-DEFAULT_USER_NEWS_TIMEFRAME, DEFAULT_USER_NEWS_COUNT, current_user) } %>
 		  <% end %>
     <% end %>