diff options
| author | Reverite <github@reverite.sh> | 2019-02-24 22:18:10 -0800 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-02-24 22:18:10 -0800 |
| commit | 54e480ca0939ba737f5abdf4ee861cd63c025865 (patch) | |
| tree | 760cdd75fd0922266b60e784c06db99902ef5692 /app/views/admin/accounts | |
| parent | ff9a09a9a7f73b558c53f334573b94198eb8d08a (diff) | |
| parent | d82de360c13894746d3974d11c9505c8937ebdee (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/views/admin/accounts')
| -rw-r--r-- | app/views/admin/accounts/index.html.haml | 5 | ||||
| -rw-r--r-- | app/views/admin/accounts/show.html.haml | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/app/views/admin/accounts/index.html.haml b/app/views/admin/accounts/index.html.haml index 91fddadf8..345f74f90 100644 --- a/app/views/admin/accounts/index.html.haml +++ b/app/views/admin/accounts/index.html.haml @@ -26,8 +26,9 @@ = hidden_field_tag key, params[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}") + - unless key == :by_domain && params[:remote].blank? + .input.string.optional + = text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.accounts.#{key}") .actions %button= t('admin.accounts.search') diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml index 280a834ba..7ac73bd07 100644 --- a/app/views/admin/accounts/show.html.haml +++ b/app/views/admin/accounts/show.html.haml @@ -166,6 +166,12 @@ - else = link_to t('admin.accounts.perform_full_suspension'), new_admin_account_action_path(@account.id, type: 'suspend'), class: 'button button--destructive' if can?(:suspend, @account) + - unless @account.local? + - if DomainBlock.where(domain: @account.domain).exists? + = link_to t('admin.domain_blocks.undo'), admin_instance_path(@account.domain), class: 'button' + - else + = link_to t('admin.domain_blocks.add_new'), new_admin_domain_block_path(_domain: @account.domain), class: 'button button--destructive' + %hr.spacer/ - unless @warnings.empty? |