Merge remote-tracking branch 'upstream/pull/5378'

[rails.git] / app / views / oauth2_authorized_applications / _application.html.erb

diff --git a/app/views/oauth2_authorized_applications/_application.html.erb b/app/views/oauth2_authorized_applications/_application.html.erb
index f8e9a11850cc0cf0e6b77a47c4c4652aaa756267..4209b8ff919acb36cc5e1bddd98bb3d707fc92ee 100644 (file)
--- a/app/views/oauth2_authorized_applications/_application.html.erb
+++ b/app/views/oauth2_authorized_applications/_application.html.erb
@@ -4,12 +4,15 @@
   </td>
   <td class="align-middle">
     <ul class="list-unstyled mb-0">
   </td>
   <td class="align-middle">
     <ul class="list-unstyled mb-0">

-      <% application.scopes.each do |scope| -%>
-        <li><%= t "oauth.scopes.#{scope}" %></li>
+      <% application.authorized_scopes_for(current_user).each do |scope| -%>
+        <li><%= authorization_scope(scope) %></li>

       <% end -%>
     </ul>
   </td>
       <% end -%>
     </ul>
   </td>

-  <td class="align-middle text-right">
+  <td class="align-middle">
+    <%= friendly_date_ago(application.authorized_tokens.where(:resource_owner_id => current_user).maximum(:created_at)) %>
+  </td>
+  <td class="align-middle text-end">

     <%= link_to t(".revoke"), oauth_authorized_application_path(application), { :method => :delete, :class => "btn btn-outline-danger", :data => { :confirm => t(".confirm_revoke") } } %>
   </td>
 </tr>
     <%= link_to t(".revoke"), oauth_authorized_application_path(application), { :method => :delete, :class => "btn btn-outline-danger", :data => { :confirm => t(".confirm_revoke") } } %>
   </td>
 </tr>