diff options
| author | Starfall <root@starfall.blue> | 2020-04-11 20:04:46 -0500 |
|---|---|---|
| committer | Starfall <root@starfall.blue> | 2020-04-11 20:04:46 -0500 |
| commit | 144ecfcfc7d9974117f1563084409a9558290a60 (patch) | |
| tree | a26bd8374e4b8264dbae815fbfbd3b91ae51450b /app/views | |
| parent | 12d35783db1bb302d7540d8d3690ab6eed3dac3b (diff) | |
Revert "Revert "Merge branch 'glitch'""
This reverts commit 12d35783db1bb302d7540d8d3690ab6eed3dac3b.
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/accounts/show.html.haml | 6 | ||||
| -rw-r--r-- | app/views/auth/registrations/new.html.haml | 2 | ||||
| -rw-r--r-- | app/views/authorize_interactions/show.html.haml | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml index a83f77134..a30b78db2 100644 --- a/app/views/admin/accounts/show.html.haml +++ b/app/views/admin/accounts/show.html.haml @@ -27,9 +27,9 @@ = fa_icon 'check' = Formatter.instance.format_field(account, field.value, custom_emojify: true) - - if account.note.present? - %div - .account__header__content.emojify= Formatter.instance.simplified_format(account, custom_emojify: true) + - if account.note.present? + %div + .account__header__content.emojify= Formatter.instance.simplified_format(account, custom_emojify: true) .dashboard__counters{ style: 'margin-top: 10px' } %div diff --git a/app/views/auth/registrations/new.html.haml b/app/views/auth/registrations/new.html.haml index e807c8d86..bcd66fb8a 100644 --- a/app/views/auth/registrations/new.html.haml +++ b/app/views/auth/registrations/new.html.haml @@ -27,7 +27,7 @@ - if approved_registrations? && !@invite.present? .fields-group - = f.simple_fields_for :invite_request do |invite_request_fields| + = f.simple_fields_for :invite_request, resource.invite_request || resource.build_invite_request do |invite_request_fields| = invite_request_fields.input :text, as: :text, wrapper: :with_block_label, required: false = f.input :invite_code, as: :hidden diff --git a/app/views/authorize_interactions/show.html.haml b/app/views/authorize_interactions/show.html.haml index 7ca9b98c1..42c874134 100644 --- a/app/views/authorize_interactions/show.html.haml +++ b/app/views/authorize_interactions/show.html.haml @@ -11,6 +11,12 @@ = t('authorize_follow.already_following') = render 'post_follow_actions' + - elsif current_account.requested?(@resource) + .flash-message + %strong + = t('authorize_follow.already_requested') + + = render 'post_follow_actions' - else = form_tag authorize_interaction_path, method: :post, class: 'simple_form' do = hidden_field_tag :action, :follow |