diff --git a/app/assets/javascripts/admin/templates/api-keys.hbs b/app/assets/javascripts/admin/templates/api-keys.hbs index d631e4188d8..a1254f3042b 100644 --- a/app/assets/javascripts/admin/templates/api-keys.hbs +++ b/app/assets/javascripts/admin/templates/api-keys.hbs @@ -3,6 +3,8 @@ {{i18n "admin.api.key"}} {{i18n "admin.api.user"}} + {{i18n "admin.api.created"}} + {{i18n "admin.api.last_used"}}   @@ -10,6 +12,7 @@ {{k.key}} +
{{i18n 'admin.api.user'}}
{{#if k.user}} {{#link-to "adminUser" k.user}} {{avatar k.user imageSize="small"}} @@ -18,6 +21,18 @@ {{i18n "admin.api.all_users"}} {{/if}} + +
{{i18n 'admin.api.created'}}
+ {{format-date k.created_at}} + + +
{{i18n 'admin.api.last_used'}}
+ {{#if k.last_used_at}} + {{format-date k.last_used_at}} + {{else}} + {{i18n "admin.api.never_used"}} + {{/if}} + {{d-button class="btn-default" diff --git a/app/serializers/api_key_serializer.rb b/app/serializers/api_key_serializer.rb index bb807269b85..59f874be3ed 100644 --- a/app/serializers/api_key_serializer.rb +++ b/app/serializers/api_key_serializer.rb @@ -3,7 +3,9 @@ class ApiKeySerializer < ApplicationSerializer attributes :id, - :key + :key, + :last_used_at, + :created_at has_one :user, serializer: BasicUserSerializer, embed: :objects diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 91685d68ea2..f30f1087fb6 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -3302,6 +3302,9 @@ en: user: "User" title: "API" key: "API Key" + created: Created + last_used: Last Used + never_used: (never) generate: "Generate" regenerate: "Regenerate" revoke: "Revoke"