From 2f021aecee7a382b3bd9846b2c7ec99f355ff269 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 22 Apr 2015 12:43:20 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=88=90=E5=91=98=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E8=A7=92=E8=89=B2=E3=80=82=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=BE=97=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/_project_member_list.html.erb | 6 +++++- config/configuration.yml | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/views/projects/_project_member_list.html.erb b/app/views/projects/_project_member_list.html.erb index 72dd4ded2..fbaa837ac 100644 --- a/app/views/projects/_project_member_list.html.erb +++ b/app/views/projects/_project_member_list.html.erb @@ -8,8 +8,12 @@ <%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :width => 32, :height => 32)) %> + <%= l(:label_user_for_project_grade) %>：<%= format("%.2f" ,read_user_project_scores(member.user,@project)).to_i %> + <%= l(:label_username)%> - <%= link_to(member.user.name, user_path(member.user),:class => "ml10 c_blue02") %> + <%= link_to(member.user.name, user_path(member.user),:class => "ml10 c_blue02") %>（<%= rolesToLanguage(member.roles.sort.collect(&:to_s)).join(', ') %>）
+ + <%= format_date(member.created_on)%>
diff --git a/config/configuration.yml b/config/configuration.yml index a62cb590b..415d4b072 100644 --- a/config/configuration.yml +++ b/config/configuration.yml @@ -83,12 +83,12 @@ default: email_delivery: delivery_method: :smtp smtp_settings: - address: smtp.126.com + address: smtp.163.com port: 25 - domain: smtp.126.com + domain: smtp.163.com authentication: :plain - user_name: "alanlong9278@126.com" - password: 'alanlong8788786' + user_name: "huang.jingquan@163.com" + password: 'xinhu1ji2qu366' # Absolute path to the directory where attachments are stored. # The default is the 'files' directory in your Redmine instance.