@@ -165,6 +167,7 @@
<% end %>
+
diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb
index 676761831..9e21c640b 100644
--- a/app/views/projects/_development_group.html.erb
+++ b/app/views/projects/_development_group.html.erb
@@ -1,52 +1,57 @@
-<% 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 %>
+
<% 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 %>
+
<%= 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 %>
- (<%= ForgeActivity.where("project_id = ?", @project.id).count %>)
+ (<%= ForgeActivity.where("project_id = ?", @project.id).count %>)
<% end %>
<% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
-
- <%= link_to l(:label_issue_tracking), project_issues_path(@project), :class => "f14 c_blue02" %>
- <% unless @project.issues.visible.all.count == 0 %>
- (<%= @project.issues.visible.all.count %>)
- <% end %>
- <% if User.current.member_of?(@project) %>
- <%= link_to "+"+l(:label_release_issue), new_project_issue_path(@project) , :class => "subnav_green" %>
- <% end %>
-
+
+ <%= link_to l(:label_issue_tracking), project_issues_path(@project), :class => "f14 c_blue02" %>
+ <% unless @project.issues.visible.all.count == 0 %>
+ (<%= @project.issues.visible.all.count %>)
+ <% end %>
+ <% if User.current.member_of?(@project) %>
+ <%= link_to "+"+l(:label_release_issue), new_project_issue_path(@project) , :class => "subnav_green" %>
+ <% end %>
+
<% end %>
<% unless @project.enabled_modules.where("name = 'boards'").empty? %>
-
- <%= link_to l(:project_module_boards), project_boards_path(@project), :class => "f14 c_blue02" %>
- <% unless @project.boards.first.topics.count == 0 %>
- (<%= @project.boards.first.topics.count %>)
- <% end %>
- <% if User.current.member_of?(@project) %>
- <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %>
- <% end %>
-
+
+ <%= link_to l(:project_module_boards), project_boards_path(@project), :class => "f14 c_blue02" %>
+ <% unless @project.boards.first.topics.count == 0 %>
+ (<%= @project.boards.first.topics.count %>)
+ <% end %>
+ <% if User.current.member_of?(@project) %>
+ <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %>
+ <% end %>
+
<% end%>
<% unless @project.enabled_modules.where("name = 'files'").empty? %>
-
- <%= link_to l(:project_module_files), project_files_path(@project), :class => "f14 c_blue02" %>
- <% unless attaments_num == 0 %>
- (<%= attaments_num %>)
- <% end %>
- <% if User.current.member_of?(@project) %>
- <%= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %>
- <% end %>
-
+
+
+ <% 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 %>
+ (<%= attaments_num %>)
+ <% end %>
+ <% if User.current.member_of?(@project) %>
+ <%= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %>
+ <% end %>
+
+
<% end %>
<%# --版本库被设置成私有、module中设置不显示、没有创建版本库 三种情况不显示-- %>
<% if visible_repository?(@project) %>
-
- <%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>
- (<%= @project.repositories.count %>)
-
+
+ <%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>
+ (<%= @project.repositories.count %>)
+
<% end %>
<%= l(:label_project_more) %>
\ No newline at end of file
+
+<% end %>
\ No newline at end of file
diff --git a/app/views/projects/_research_team.html.erb b/app/views/projects/_research_team.html.erb
index b2b0e3c33..21a6ab31c 100644
--- 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 %>
<%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>
@@ -37,4 +38,4 @@
<%= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %>
<% end %>
-<% end%>
\ No newline at end of file
+<% end%>