From 3750252f396eedd6f168ff3d72b90fa9a7cc6212 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 19 Oct 2016 09:35:53 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=9B=E5=BB=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=B8=8E=E7=94=A8=E6=88=B7=E5=8A=A8=E6=80=81=E4=B8=AD?= =?UTF-8?q?=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projects/_project_activities.html.erb | 2 +- app/views/projects/_project_create.html.erb | 25 ++----------------- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/app/views/projects/_project_activities.html.erb b/app/views/projects/_project_activities.html.erb index 7ba1d7acc..07363a0a5 100644 --- a/app/views/projects/_project_activities.html.erb +++ b/app/views/projects/_project_activities.html.erb @@ -45,7 +45,7 @@ <%= render :partial => 'projects/act_messages', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id, :is_course => 1, :is_board => 0} %> <% when "Attachment" %> - <%= render :partial => 'users/project_attachment', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id } %> + <%= render :partial => 'projects/project_attachment', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id } %> <% when "Commit" %> <%= render :partial => 'projects/project_commit', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id, :identifier => get_rep_identifier_by_project(@project) } %> <% end %> diff --git a/app/views/projects/_project_create.html.erb b/app/views/projects/_project_create.html.erb index 0d24c4f6b..a62276542 100644 --- a/app/views/projects/_project_create.html.erb +++ b/app/views/projects/_project_create.html.erb @@ -4,15 +4,10 @@
<%= link_to image_tag(url_to_avatar(user), :width => "50", :height => "50"), user_path(user), :alt => "用户头像" %> - <%= render :partial => 'users/show_detail_info', :locals => {:user => user} %>
- <% if user.try(:realname) == ' ' %> - <%= link_to user, user_path(user), :class => "newsBlue mr15" %> - <% else %> - <%= link_to user.try(:realname), user_path(user), :class => "newsBlue mr15" %> - <% end %> + <%= link_to user.show_name, user_path(user), :class => "newsBlue mr15" %> TO <%= link_to project.to_s+" | 项目", project_path(project.id,:host=>Setting.host_course), :class => "newsBlue ml15" %>
@@ -22,23 +17,7 @@
创建时间:<%= format_time(project.created_on) %>
-
- - + \ No newline at end of file