Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop
This commit is contained in:
commit
7673a13d3a
|
@ -17,12 +17,8 @@
|
||||||
<td><%= feedback&.user&.login%></td>
|
<td><%= feedback&.user&.login%></td>
|
||||||
<td><%= feedback&.user&.mail%></td>
|
<td><%= feedback&.user&.mail%></td>
|
||||||
<td><%= feedback.created_at&.strftime('%Y-%m-%d %H:%M') %></td>
|
<td><%= feedback.created_at&.strftime('%Y-%m-%d %H:%M') %></td>
|
||||||
<td>
|
<td style="word-wrap: break-word;">
|
||||||
<span class="d-inline-block" tabindex="0" data-toggle="tooltip" data-placement="left" title="<%= feedback.content%>">
|
<%= feedback.content %>
|
||||||
<a href="javascript:">
|
|
||||||
<%= feedback.content.truncate(20) %>
|
|
||||||
</a>
|
|
||||||
</span>
|
|
||||||
</td>
|
</td>
|
||||||
<td class="action-container">
|
<td class="action-container">
|
||||||
<%= link_to "发送邮件", new_history_admins_feedback_path(feedback), remote: true, class: "action" %>
|
<%= link_to "发送邮件", new_history_admins_feedback_path(feedback), remote: true, class: "action" %>
|
||||||
|
|
Loading…
Reference in New Issue