Merge branch 'hjq_beidou' into develop

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>

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%>">
+      <span class="author">
-        <%= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author),:class => "c_orange" %>,
         <%= format_time(attachment.created_on) %>
       </span>
       <div class="cl"></div>