From e798381feb81ffb52a16a530b219679cfa1b23cf Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 1 Sep 2016 16:39:09 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=B5=84=E6=BA=90=E6=95=B0?= =?UTF-8?q?=E6=94=B9=E6=88=90=E5=AE=9E=E6=97=B6=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/_development_group.html.erb | 5 +++-- app/views/projects/_friend_group.html.erb | 5 +++-- app/views/projects/_research_team.html.erb | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb index 52f4e002a..17742f023 100644 --- a/app/views/projects/_development_group.html.erb +++ b/app/views/projects/_development_group.html.erb @@ -1,3 +1,4 @@ +<% project_file_num = Attachment.where(:container_type => "Project", :container_id => @project.id).count %>
<%= 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 %> @@ -30,8 +31,8 @@ <% unless @project.enabled_modules.where("name = 'files'").empty? %>
<%= link_to l(:project_module_files), project_files_path(@project), :class => "f14 c_blue02" %> - <% unless @project.project_score.attach_num == 0 %> - <%= link_to "(#{@project.project_score.attach_num})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %> + <% unless project_file_num == 0 %> + <%= link_to "(#{project_file_num})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %> <% end %> <% if User.current.member_of?(@project) %> <%#= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %> diff --git a/app/views/projects/_friend_group.html.erb b/app/views/projects/_friend_group.html.erb index d50f96f22..f56d8a266 100644 --- a/app/views/projects/_friend_group.html.erb +++ b/app/views/projects/_friend_group.html.erb @@ -1,3 +1,4 @@ +<% project_file_num = Attachment.where(:container_type => "Project", :container_id => @project.id).count %>
<%= 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 %> @@ -18,8 +19,8 @@ <% unless @project.enabled_modules.where("name = 'files'").empty? %>
<%= link_to l(:project_module_files), project_files_path(@project), :class => "f14 c_blue02" %> - <% unless @project.project_score.attach_num == 0 %> - <%= link_to "(#{@project.project_score.attach_num})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %> + <% unless project_file_num == 0 %> + <%= link_to "(#{project_file_num})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %> <% end %> <% if User.current.member_of?(@project) %> <%= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml105" %> diff --git a/app/views/projects/_research_team.html.erb b/app/views/projects/_research_team.html.erb index 1d2debdfe..483ae9695 100644 --- a/app/views/projects/_research_team.html.erb +++ b/app/views/projects/_research_team.html.erb @@ -1,3 +1,4 @@ +<% project_file_num = Attachment.where(:container_type => "Project", :container_id => @project.id).count %>
<%= 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 %> @@ -29,8 +30,8 @@ <% unless @project.enabled_modules.where("name = 'files'").empty? %>
<%= link_to l(:project_module_files), project_files_path(@project), :class => "f14 c_blue02" %> - <% unless @project.project_score.attach_num == 0 %> - <%= link_to "(#{@project.project_score.attach_num})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %> + <% unless project_file_num == 0 %> + <%= link_to "(#{project_file_num})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %> <% end %> <% if User.current.member_of?(@project) %> <%= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml105" %>