about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMitarashiDango <MitarashiDango@users.noreply.github.com>2017-11-01 22:46:05 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-11-01 14:46:05 +0100
commit38d072446be2321c82f42b6e1cf90891f935725c (patch)
tree768730a3b0c095019b16e123f853bb3469cc2771
parent8ae9bd0eea75a0a22c08e1e45b2136674aa88cf5 (diff)
add account search condition (instance domain) (#5577)
-rw-r--r--app/views/admin/accounts/index.html.haml2
-rw-r--r--config/locales/en.yml1
2 files changed, 2 insertions, 1 deletions
diff --git a/app/views/admin/accounts/index.html.haml b/app/views/admin/accounts/index.html.haml
index 1b56a3a31..27a0682d8 100644
--- a/app/views/admin/accounts/index.html.haml
+++ b/app/views/admin/accounts/index.html.haml
@@ -42,7 +42,7 @@
       - if params[key].present?
         = hidden_field_tag key, params[key]
 
-    - %i(username display_name email ip).each do |key|
+    - %i(username by_domain display_name email ip).each do |key|
       .input.string.optional
         = text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.accounts.#{key}")
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2d821550a..d72ec92d0 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -59,6 +59,7 @@ en:
       destroyed_msg: Moderation note successfully destroyed!
     accounts:
       are_you_sure: Are you sure?
+      by_domain: Domain
       confirm: Confirm
       confirmed: Confirmed
       disable_two_factor_authentication: Disable 2FA