Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

sso
杨树明 5 years ago
commit 9c87194eb9

@ -30,11 +30,13 @@
</td>
<td><%= user.real_name %></td>
<td><%= raw [user.school_name.presence, user.department_name.presence].compact.join('<br/>') %></td>
<td>
<td class="text-left">
<% if item.item_type == "PROGRAM" %>
<%= link_to item.name, "/problems/#{item.container&.identifier}/edit", target: "_blank" %>
<%= link_to item.name, "/problems/#{item.container&.identifier}/edit", class: "d-inline-block text-truncate",
style: "max-width: 280px", target: "_blank", data: { toggle: 'tooltip', title: "#{item.name}"} %>
<% else %>
<%= link_to item.name, admins_item_authentication_path(apply), remote: true %>
<%= link_to item.name, admins_item_authentication_path(apply), remote: true, class: "d-inline-block text-truncate",
style: "max-width: 280px", data: { toggle: 'tooltip', title: "#{item.name}"} %>
<% end %>
</td>
<td><%= item.type_string %></td>

Loading…
Cancel
Save