From: Anton Khorev <tony29@yandex.ru>
Date: Sun, 31 Dec 2023 01:43:09 +0000 (+0300)
Subject: Add login notice for note discussions
X-Git-Tag: live~856^2
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/3776adcfc0404413f85ba77000fcf5a42f33d3f5

Add login notice for note discussions
---

diff --git a/app/views/notes/show.html.erb b/app/views/notes/show.html.erb
index fda8946b6..d355d3e5f 100644
--- a/app/views/notes/show.html.erb
+++ b/app/views/notes/show.html.erb
@@ -65,6 +65,10 @@
                                                    :url => comment_api_note_url(@note, "json") } %>
         </div>
       </form>
+    <% else -%>
+      <p>
+        <%= link_to t(".log_in_to_comment"), login_path(:referer => request.fullpath) %>
+      </p>
     <% end -%>
   <% else %>
     <form class="mb-3" action="#">
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 792dcdef1..22d2ded92 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3005,6 +3005,7 @@ en:
       reactivate: Reactivate
       comment_and_resolve: Comment & Resolve
       comment: Comment
+      log_in_to_comment: "Log in to comment on this note"
       report_link_html: "If this note contains sensitive information that needs to be removed, you can %{link}."
       other_problems_resolve: "For all other problems with the note, please resolve it yourself with a comment."
       other_problems_resolved: "For all other problems, resolving is sufficient."
diff --git a/test/system/note_comments_test.rb b/test/system/note_comments_test.rb
index 23f3fc98e..2ad64ccc8 100644
--- a/test/system/note_comments_test.rb
+++ b/test/system/note_comments_test.rb
@@ -1,6 +1,23 @@
 require "application_system_test_case"
 
 class NoteCommentsTest < ApplicationSystemTestCase
+  test "open note has login notice" do
+    note = create(:note_with_comments)
+    visit note_path(note)
+
+    assert_no_button "Resolve"
+    assert_no_button "Comment"
+    assert_link "Log in to comment on this note", :href => login_path(:referer => note_path(note))
+  end
+
+  test "closed note has no login notice" do
+    note = create(:note_with_comments, :status => "closed", :closed_at => Time.now.utc)
+    visit note_path(note)
+
+    assert_no_button "Reactivate"
+    assert_no_link "Log in to comment on this note"
+  end
+
   def test_action_text
     note = create(:note_with_comments)
     sign_in_as(create(:user))