From 57716e7efce9488ffd0c2228e2e109674047548e Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 8 Apr 2016 12:31:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=90=E5=91=98=E6=B2=A1=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E8=80=8C=E5=AF=BC=E8=87=B4=E7=82=B9=E5=87=BB=E7=A1=AE=E5=AE=9A?=
 =?UTF-8?q?=E5=8F=91=E6=B6=88=E6=81=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/settings/_new_members.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/settings/_new_members.html.erb b/app/views/projects/settings/_new_members.html.erb
index 733eacab4..b73ef647f 100644
--- a/app/views/projects/settings/_new_members.html.erb
+++ b/app/views/projects/settings/_new_members.html.erb
@@ -138,7 +138,7 @@
               </li>
               <% roles.each do |role| %>
                   <li>
-                    <%= radio_button_tag 'membership[role_ids][]', role.id %>
+                    <%= radio_button_tag 'membership[role_ids][]', role.id, role.name == "报告人员" || role.name == "Reporter"  %>
                     <% if User.current.language == "zh" %>
                         <% if role.id == 3 %>
                             <label >管理人员</label>

From 9f44babff54222e6fe0ef1c78415ed5860db0b3f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 8 Apr 2016 18:20:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=99=84=E4=BB=B6=E4=B8=AD=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/_work_attachments_status.html.erb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/views/student_work/_work_attachments_status.html.erb b/app/views/student_work/_work_attachments_status.html.erb
index 6a8591197..79f14aae5 100644
--- a/app/views/student_work/_work_attachments_status.html.erb
+++ b/app/views/student_work/_work_attachments_status.html.erb
@@ -7,8 +7,7 @@
       </span>
       <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :format => 'js'), :method => 'delete', :remote => true, :title => '删除', :class => 'remove-upload fl', :confirm => l(:text_are_you_sure)) if attachment.id && User.current == attachment.author && status != 2 %>
       <span class="postAttSize">(<%= number_to_human_size attachment.filesize %>)</span>
-      <span class="author" title="<%= attachment.author%>">
-        <%= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author),:class => "c_orange" %>,
+      <span class="author">
         <%= format_time(attachment.created_on) %>
       </span>
       <div class="cl"></div>