Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

exceptionHandle
yanxd 12 years ago
commit b29dcb0446

@ -20,7 +20,7 @@
<span class="font_lighter">
<%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>
<%= l(:label_new_activity) %> </span>
<%= link_to "#{eventToLanguage(e.event_type)}: "<<format_activity_title(e.event_title), e.event_url %>
<%= link_to "#{eventToLanguage(e.event_type)}: "<< format_activity_title(e.event_title), e.event_type.eql?("attachment") ? project_files_path(e.container) : e.event_url %>
</td>
</tr>
<tr>

Loading…
Cancel
Save