项目动态缓存先还原

app/views/layouts/new_base_user.html.erb

@@ -166,9 +166,9 @@
             <font class="show-all-sub"><%= link_to '全部',{:controller => "users", :action => "user_courselist", :id => @user.id}, :class => "linkGrey2" %></font>
             <% courses = @user.favorite_courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(10) %>
             <div class="<%= courses.empty? ? 'none' : ''%>" id="homepage_left_course_list">
-              <% cache [:personal_courses,@user.id,courses.count,courses[0].updated_at.to_i] do%>
+              <%# cache [:personal_courses,@user.id,courses.count,courses[0].updated_at.to_i] do%>
                 <%=render :partial => 'layouts/homepage_left_course_list', :locals => {:courses => courses} %>
-              <% end %>
+              <%# end %>
             </div>
           </li>
           <% if is_current_user %>
@@ -196,9 +196,9 @@
             <font class="show-all-sub"><%= link_to '全部',{:controller => "users", :action => "user_projectlist", :id => @user.id}, :class => 'linkGrey2'%></font>
             <% projects = @user.favorite_projects.visible.select("projects.*, (SELECT MAX(updated_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(10)%>
             <div class="<%= projects.empty? ? 'none' : ''%>" id="homepage_left_project_list">
-              <% cache [:personal_projects,@user.id,projects.count,projects[0].updated_on.to_i] do%>
+              <%# cache [:personal_projects,@user.id,projects.count,projects[0].updated_on.to_i] do%>
                 <%=render :partial => 'layouts/homepage_left_project_list', :locals => {:projects => projects} %>
-              <% end %>
+              <%# end %>
             </div>
           </li>
           <% if is_current_user %>

app/views/users/_project_issue.html.erb

@@ -1,6 +1,5 @@
 <% unless activity.author.nil? %>
-    <div class="resources mt10" id="user_activity_<%= user_activity_id%>">
-      <% cache [:user_projectissue_activity,activity.id.to_s+"-"+User.current.logged?.to_s+"-"+(defined?(project_id)).to_s+"-"+(defined?(user_id)).to_s+"-"+(activity.editable?).to_s+"-"+(User.current.allowed_to?(:edit_issues, activity.project)).to_s+"-"+(User.current.allowed_to?(:delete_issues, activity.project)).to_s+"-"+(User.current.allowed_to?(:add_issues, activity.project)).to_s+"-"+activity.updated_on.to_i.to_s] do%>
+<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
       <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
@@ -96,14 +95,13 @@
     </div>
     <div class="cl"></div>
   </div>
-      <% end %>
   <div id="div_user_issue_reply_<%=user_activity_id%>">
     <%= render :partial => 'users/project_issue_reply', :locals => {:activity => activity, :user_activity_id => user_activity_id} %>
   </div>
-    </div>
-    <script type="text/javascript">
+</div>
+<script type="text/javascript">
     $(function(){
         user_card_show_hide();
     });
-    </script>
+</script>
 <% end %>

app/views/users/_project_message.html.erb

@@ -1,6 +1,4 @@
 <div class="resources mt10" id="user_activity_<%= user_activity_id%>">
-  <% update_time = get_forge_act_message(activity, activity.class.to_s) %>
-  <% cache [:user_projectmessage_activity,activity.id.to_s+"-"+User.current.logged?.to_s+"-"+(activity.author.id == User.current.id).to_s+"-"+(activity.editable_by?(User.current)).to_s+"-"+(activity.destroyable_by?(User.current)).to_s+"-"+update_time] do%>
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
       <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
@@ -31,7 +29,7 @@
         发帖时间：<%= format_time(activity.created_on) %>
       </div>
       <div class="homepagePostDate fl ml15">
-        更新时间：<%= update_time %>
+        更新时间：<%= get_forge_act_message(activity, activity.class.to_s) %>
       </div>
       <div class="cl"></div>
       <% if activity.parent_id.nil? %>
@@ -83,7 +81,6 @@
     </div>
     <div class="cl"></div>
   </div>
-  <% end %>
   <% all_comments = []%>
   <% count=get_all_children(all_comments, activity).count %>
   <%# allow_delete = (activity.user == User.current || User.current.admin? || User.current.allowed_to?(:as_teacher,activity.course)) %>