Signed-off-by: alan <547533434@qq.com>

10 years ago · 0b6f35055d
parent b1a60d3118
commit 0b6f35055d
4 changed files with 46 additions and 36 deletions
--- a/app/views/layouts/_user_courses_list.html.erb
+++ b/app/views/layouts/_user_courses_list.html.erb
@ -3,7 +3,7 @@
      <%=link_to l(:label_my_course), user_courses_user_path(User.current.id) %>
      <ul class="course_sub_menu">
        <% course_index = 0 %>
-        <% User.current.courses.each do |course| %>
+        <% cache User.current.courses.each do |course| %>
            <% if !course_endTime_timeout?(course) %>
                <%= render :partial => 'layouts/user_homework_list', :locals => {:course => course,:course_index => course_index} %>
                <% course_index += 1 %>
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@ -70,6 +70,7 @@
 <!--add by huang-->
 <body>
 <div id="Container">
+
  <%= render :partial => 'layouts/new_header'%>
  <div class="cl"></div>

@ -103,6 +104,7 @@
      <% end %>
    </div>
  </div><!--TopBar end-->
+
  <div id="content">
    <div id="LSide" class="fl">
      <div class="project_info">
@ -165,6 +167,7 @@
        <% end %><!--end-->
        <!--menu 左侧工具栏 -->
        <!--project_new_type: 1为开发组；2为科研组；3为朋友圈子-->
+
        <div id="project_memu_list">
          <% if @project.project_new_type == 1 || @project.project_new_type.nil? %>
            <%= render :partial => 'projects/development_group', :locals => {:project => @project}%>
@ -174,6 +177,7 @@
            <%= render :partial => 'projects/friend_group', :locals => {:project => @project}%>
          <% end %>
        </div>
+
        <!-- end -->
      </div><!--项目侧导航 end-->
      <div class="cl"></div>
--- a/app/views/projects/_development_group.html.erb
+++ b/app/views/projects/_development_group.html.erb
@ -1,4 +1,5 @@
-<% attaments_num = @project.attachments.count+Attachment.where(["`container_type` = 'Version' and `container_id` in (?)",@project.versions.map{ |v| v.id}]).all.count  %>
+<% cache @project do %>
+
 <div class="subNav">
  <%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>
  <% unless ForgeActivity.where("project_id = ?", @project.id).count == 0 %>
@ -28,7 +29,9 @@
    </div>
 <% end%>
 <% unless @project.enabled_modules.where("name = 'files'").empty? %>
+
    <div class="subNav">
+      <% attaments_num = @project.attachments.count+Attachment.where(["`container_type` = 'Version' and `container_id` in (?)",@project.versions.map{ |v| v.id}]).all.count  %>
      <%= link_to l(:project_module_files), project_files_path(@project), :class => "f14 c_blue02" %>
      <% unless attaments_num == 0 %>
          <a class="subnav_num">(<%= attaments_num  %>)</a>
@ -37,6 +40,7 @@
          <%= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %>
      <% end %>
    </div>
+
 <% end %>
 <%# --版本库被设置成私有、module中设置不显示、没有创建版本库 三种情况不显示-- %>
 <% if visible_repository?(@project) %>
@ -50,3 +54,4 @@
 <ul class="navContent" id="navContent">
  <%= render 'projects/tools_expand' %>
 </ul>
+<% end %>
--- a/app/views/projects/_research_team.html.erb
+++ b/app/views/projects/_research_team.html.erb
@ -1,3 +1,4 @@
+<% cache @project %>
 <% attaments_num = @project.attachments.count+Attachment.where(["`container_type` = 'Version' and `container_id` in (?)",@project.versions.map{ |v| v.id}]).all.count  %>
 <div class="subNav">
  <%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>