about summary refs log tree commit diff
path: root/app/views/settings
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-04-15 18:24:41 +0200
committerGitHub <noreply@github.com>2020-04-15 18:24:41 +0200
commit5fdd5eef5a6b05b072a57e065954fdcb0b4a8898 (patch)
treed8f035139c20e59c39bb35a74686783094c297da /app/views/settings
parent615073df33b9a4317ac5c93fdef83c9cd34567fa (diff)
parent66ad30db489ddb2b3ecc98d284aabd47c9d4ae84 (diff)
Merge pull request #1317 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/settings')
-rw-r--r--app/views/settings/aliases/index.html.haml10
1 files changed, 7 insertions, 3 deletions
diff --git a/app/views/settings/aliases/index.html.haml b/app/views/settings/aliases/index.html.haml
index 5b6986368..5df0c9669 100644
--- a/app/views/settings/aliases/index.html.haml
+++ b/app/views/settings/aliases/index.html.haml
@@ -23,7 +23,11 @@
         %th= t('simple_form.labels.account_alias.acct')
         %th
     %tbody
-      - @aliases.each do |account_alias|
+      - if @aliases.empty?
         %tr
-          %td= account_alias.acct
-          %td= table_link_to 'trash', t('aliases.remove'), settings_alias_path(account_alias), data: { method: :delete }
+          %td.muted-hint{ colspan: 2 }= t('aliases.empty')
+      - else
+        - @aliases.each do |account_alias|
+          %tr
+            %td= account_alias.acct
+            %td= table_link_to 'trash', t('aliases.remove'), settings_alias_path(account_alias), data: { method: :delete }