Merge branch 'dev_shcool' into develop

This commit is contained in:
daiao 2016-09-14 17:28:27 +08:00
commit cd59a8d597
1 changed files with 2 additions and 2 deletions

View File

@ -91,8 +91,8 @@
 
<% end %>
<% if options[:author] %>
<span class="author" title="<%= attachment.author%>">
<%= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author),:class => "link-blue" %>,
<span class="author" title="<%= attachment.author.show_name%>">
<%= link_to h(truncate(attachment.author.show_name, length: 10, omission: '...')),user_path(attachment.author),:class => "link-blue" %>,
<%= format_time(attachment.created_on) %>
</span>
<% end %>