jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into weixin_guange

This commit is contained in:
guange 2016-04-08 20:02:40 +08:00
parent 3ff19364dc cb9fd1d2ba
commit 9ae030ed9e
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/projects/settings/_new_members.html.erb
View File

@ -138,7 +138,7 @@
</li> </li>
<% roles.each do |role| %> <% roles.each do |role| %>
<li> <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 User.current.language == "zh" %>
<% if role.id == 3 %> <% if role.id == 3 %>
<label >管理人员</label> <label >管理人员</label>

3
app/views/student_work/_work_attachments_status.html.erb
View File

@ -7,8 +7,7 @@
</span> </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 %> <%= 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="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) %> <%= format_time(attachment.created_on) %>
</span> </span>
<div class="cl"></div> <div class="cl"></div>