Create changeset_comments resources for users

diff --git a/app/controllers/users/changeset_comments_controller.rb b/app/controllers/users/changeset_comments_controller.rb
new file mode 100644 (file)
index 0000000..2b8b367
--- /dev/null
+++ b/app/controllers/users/changeset_comments_controller.rb
@@ -0,0 +1,14 @@
+module Users
+  class ChangesetCommentsController < CommentsController
+    def index
+      @title = t ".title", :user => @user.display_name
+
+      comments = ChangesetComment.where(:author => @user)
+      comments = comments.visible unless current_user&.moderator?
+
+      @params = params.permit(:display_name, :before, :after)
+
+      @comments, @newer_comments_id, @older_comments_id = get_page_items(comments, :includes => [:author])
+    end
+  end
+end

diff --git a/app/models/changeset_comment.rb b/app/models/changeset_comment.rb
index 3bc9483fa9c904da8f65df1be3758a17784f6798..22d158e82ce5a78591a9fb7ba7aeb774c85565ca 100644 (file)
--- a/app/models/changeset_comment.rb
+++ b/app/models/changeset_comment.rb
@@ -25,6 +25,8 @@ class ChangesetComment < ApplicationRecord
   belongs_to :changeset
   belongs_to :author, :class_name => "User"
 
   belongs_to :changeset
   belongs_to :author, :class_name => "User"
 

+  scope :visible, -> { where(:visible => true) }
+

   validates :id, :uniqueness => true, :presence => { :on => :update },
                  :numericality => { :on => :update, :only_integer => true }
   validates :changeset, :associated => true
   validates :id, :uniqueness => true, :presence => { :on => :update },
                  :numericality => { :on => :update, :only_integer => true }
   validates :changeset, :associated => true

diff --git a/app/views/users/changeset_comments/_page.html.erb b/app/views/users/changeset_comments/_page.html.erb
new file mode 100644 (file)
index 0000000..d061590
--- /dev/null
+++ b/app/views/users/changeset_comments/_page.html.erb
@@ -0,0 +1,22 @@
+<turbo-frame id="pagination" target="_top" data-turbo="false">
+  <table class="table table-striped" width="100%">
+    <thead>
+      <tr>
+        <th width="25%"><%= t ".changeset" %></th>
+        <th width="25%"><%= t ".when" %></th>
+        <th width="50%"><%= t ".comment" %></th>
+      </tr>
+    </thead>
+    <% @comments.each do |comment| -%>
+    <tr>
+      <td width="25%" class="<%= "text-muted" unless comment.visible? %>"><%= link_to comment.changeset.id, changeset_path(comment.changeset) %></td>
+      <td width="25%" class="<%= "text-muted" unless comment.visible? %>"><span title="<%= l comment.created_at, :format => :friendly %>"><%= time_ago_in_words(comment.created_at, :scope => :"datetime.distance_in_words_ago") %></span></td>
+      <td width="50%" class="richtext text-break<%= " text-muted" unless comment.visible? %>"><%= comment.body.to_html %></td>
+    </tr>
+    <% end -%>
+  </table>
+
+  <%= render "shared/pagination",
+             :newer_id => @newer_comments_id,
+             :older_id => @older_comments_id %>
+</turbo-frame>

diff --git a/app/views/users/comments/index.html.erb b/app/views/users/comments/index.html.erb
index 9bd23df317bf9211cc02e2a8caec96819b327d8b..db8ff15539a80070737fabfeafd80c2c0dbcb4cb 100644 (file)
--- a/app/views/users/comments/index.html.erb
+++ b/app/views/users/comments/index.html.erb
@@ -4,7 +4,10 @@
   <h1><%= t ".heading_html", :user => link_to(@user.display_name, @user) %></h1>
   <ul class="nav nav-tabs">
     <li class="nav-item">
   <h1><%= t ".heading_html", :user => link_to(@user.display_name, @user) %></h1>
   <ul class="nav nav-tabs">
     <li class="nav-item">

-      <a class="nav-link active"><%= t ".diary_entries" %></a>
+      <%= link_to t(".diary_entries"), user_diary_comments_path, :class => ["nav-link", { "active" => controller_name == "diary_comments" }] %>
+    </li>
+    <li class="nav-item">
+      <%= link_to t(".changesets"), user_changeset_comments_path, :class => ["nav-link", { "active" => controller_name == "changeset_comments" }] %>

     </li>
   </ul>
 <% end %>
     </li>
   </ul>
 <% end %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 247416b7dad41d241665adb291a87cb44cb070a7..80558e6724eaa32097f5848cb5272c3e6e021bd4 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1939,6 +1939,9 @@ en:
       preview: Preview
       help: Help
     pagination:
       preview: Preview
       help: Help
     pagination:

+      changeset_comments:
+        older: Older Comments
+        newer: Newer Comments

       diary_comments:
         older: Older Comments
         newer: Newer Comments
       diary_comments:
         older: Older Comments
         newer: Newer Comments


@@ -2875,8 +2878,16 @@ en:
     comments:
       index:
         heading_html: "%{user}'s Comments"
     comments:
       index:
         heading_html: "%{user}'s Comments"

+        changesets: "Changesets"

         diary_entries: "Diary entries"
         no_comments: "No comments"
         diary_entries: "Diary entries"
         no_comments: "No comments"

+    changeset_comments:
+      index:
+        title: "Changeset Comments added by %{user}"
+      page:
+        changeset: Changeset
+        when: When
+        comment: Comment

     diary_comments:
       index:
         title: "Diary Comments added by %{user}"
     diary_comments:
       index:
         title: "Diary Comments added by %{user}"

diff --git a/config/routes.rb b/config/routes.rb
index 5b0da5d890605f830ceef86479998ce1157eadfa..eb107ab263e423165ccb1cf752d3256455995383 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -268,6 +268,7 @@ OpenStreetMap::Application.routes.draw do
     resource :role, :controller => "user_roles", :path => "roles/:role", :only => [:create, :destroy]
     scope :module => :users do
       resources :diary_comments, :only => :index
     resource :role, :controller => "user_roles", :path => "roles/:role", :only => [:create, :destroy]
     scope :module => :users do
       resources :diary_comments, :only => :index

+      resources :changeset_comments, :only => :index

       resource :issued_blocks, :path => "blocks_by", :only => :show
       resource :received_blocks, :path => "blocks", :only => [:show, :edit, :destroy]
       resource :status, :only => :update
       resource :issued_blocks, :path => "blocks_by", :only => :show
       resource :received_blocks, :path => "blocks", :only => [:show, :edit, :destroy]
       resource :status, :only => :update

diff --git a/test/controllers/users/changeset_comments_controller_test.rb b/test/controllers/users/changeset_comments_controller_test.rb
new file mode 100644 (file)
index 0000000..db2646b
--- /dev/null
+++ b/test/controllers/users/changeset_comments_controller_test.rb
@@ -0,0 +1,37 @@
+require "test_helper"
+
+module Users
+  class ChangesetCommentsControllerTest < ActionDispatch::IntegrationTest
+    ##
+    # test all routes which lead to this controller
+    def test_routes
+      assert_routing(
+        { :path => "/user/username/changeset_comments", :method => :get },
+        { :controller => "users/changeset_comments", :action => "index", :user_display_name => "username" }
+      )
+    end
+
+    def test_index
+      user = create(:user)
+      other_user = create(:user)
+      changeset = create(:changeset, :closed)
+      create_list(:changeset_comment, 3, :changeset => changeset, :author => user)
+      create_list(:changeset_comment, 2, :changeset => changeset, :author => other_user)
+
+      get user_changeset_comments_path(user)
+      assert_response :success
+      assert_select "table.table-striped tbody" do
+        assert_select "tr", :count => 3
+      end
+
+      create(:changeset_comment, :changeset => changeset, :author => user)
+      create(:changeset_comment, :changeset => changeset, :author => user, :visible => false)
+
+      get user_changeset_comments_path(user)
+      assert_response :success
+      assert_select "table.table-striped tbody" do
+        assert_select "tr", :count => 4
+      end
+    end
+  end
+end