about summary refs log tree commit diff
path: root/app/views/authorize_follows
diff options
context:
space:
mode:
authorAkihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>2018-03-24 20:50:41 +0900
committerEugen Rochko <eugen@zeonfederated.com>2018-03-24 12:50:41 +0100
commitfa310695fa0b5fe76739232dd6acee81da6cd401 (patch)
tree6a2e9a213689cf65f9ba7cce601e754a57f516a3 /app/views/authorize_follows
parent580835ab698fb116adf26fe4c9c465b2218d124b (diff)
Note if the user is already following the target when authorizing follow (#6325)
Diffstat (limited to 'app/views/authorize_follows')
-rw-r--r--app/views/authorize_follows/_post_follow_actions.html.haml4
-rw-r--r--app/views/authorize_follows/show.html.haml8
-rw-r--r--app/views/authorize_follows/success.html.haml5
3 files changed, 12 insertions, 5 deletions
diff --git a/app/views/authorize_follows/_post_follow_actions.html.haml b/app/views/authorize_follows/_post_follow_actions.html.haml
new file mode 100644
index 000000000..2a9c062e9
--- /dev/null
+++ b/app/views/authorize_follows/_post_follow_actions.html.haml
@@ -0,0 +1,4 @@
+.post-follow-actions
+  %div= link_to t('authorize_follow.post_follow.web'), web_url("accounts/#{@account.id}"), class: 'button button--block'
+  %div= link_to t('authorize_follow.post_follow.return'), TagManager.instance.url_for(@account), class: 'button button--block'
+  %div= t('authorize_follow.post_follow.close')
diff --git a/app/views/authorize_follows/show.html.haml b/app/views/authorize_follows/show.html.haml
index f7a8f72d2..a1fd01dd6 100644
--- a/app/views/authorize_follows/show.html.haml
+++ b/app/views/authorize_follows/show.html.haml
@@ -5,7 +5,13 @@
   .follow-prompt
     = render 'card', account: @account
 
-  - unless current_account.following?(@account)
+  - if current_account.following?(@account)
+    .flash-message
+      %strong
+        = t('authorize_follow.already_following')
+    = render 'post_follow_actions'
+
+  - else
     = form_tag authorize_follow_path, method: :post, class: 'simple_form' do
       = hidden_field_tag :acct, @account.acct
       = button_tag t('authorize_follow.follow'), type: :submit
diff --git a/app/views/authorize_follows/success.html.haml b/app/views/authorize_follows/success.html.haml
index 63ff3bcf1..fa59b24b8 100644
--- a/app/views/authorize_follows/success.html.haml
+++ b/app/views/authorize_follows/success.html.haml
@@ -10,7 +10,4 @@
 
     = render 'card', account: @account
 
-  .post-follow-actions
-    %div= link_to t('authorize_follow.post_follow.web'), web_url("accounts/#{@account.id}"), class: 'button button--block'
-    %div= link_to t('authorize_follow.post_follow.return'), TagManager.instance.url_for(@account), class: 'button button--block'
-    %div= t('authorize_follow.post_follow.close')
+  = render 'post_follow_actions'