Merge branch 'dev_shcool' into develop

app/views/attachments/_project_file_links.html.erb

@@ -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 %>