]> cat aescling's git repositories - mastodon.git/commitdiff
Add "invite request content" display in user account admin page (#15265)
authorMashiro <moezhx@outlook.com>
Tue, 15 Dec 2020 05:28:14 +0000 (13:28 +0800)
committerGitHub <noreply@github.com>
Tue, 15 Dec 2020 05:28:14 +0000 (06:28 +0100)
* feat: display `invite_request_text` in admin's user account page

* fix: move invite_request to the bottom of accounts page

* fix: remove time display, remove formate, change code terminology

* fix: remove escape

app/views/admin/accounts/show.html.haml
config/locales/en.yml

index d5978eddd64a7a2ea5fa07786edb88e55e02574e..ae527cc23dbb89d33659ca0c720aadcb5ff90443 100644 (file)
 
     .actions
       = f.button :button, t('admin.account_moderation_notes.create'), type: :submit
+
+  %hr.spacer/
+
+  - if @account.user&.invite_request&.text&.present?
+    %div.speech-bubble
+      %div.speech-bubble__bubble
+        = @account.user&.invite_request&.text
+      %div.speech-bubble__owner
+        = admin_account_link_to @account
+        = t('admin.accounts.invite_request_text')
index 3ff01ac86aefab6a1cb57886fbab78166af41e7e..1f5798fccd62c90b760aff54ea0c2536408eeb5e 100644 (file)
@@ -131,6 +131,7 @@ en:
       follows: Follows
       header: Header
       inbox_url: Inbox URL
+      invite_request_text: Reasons for joining
       invited_by: Invited by
       ip: IP
       joined: Joined