From 77e49b84bf69de759da6603732f1fb60dc28f330 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Thu, 10 Jul 2025 16:32:54 +0300 Subject: [PATCH] Pass changeset to changeset line template --- app/views/browse/_common_details.html.erb | 4 ++-- app/views/changesets/_changeset.html.erb | 3 +-- app/views/changesets/_changeset_line.html.erb | 7 +++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb index cc7fadf6c..a3b04f569 100644 --- a/app/views/browse/_common_details.html.erb +++ b/app/views/browse/_common_details.html.erb @@ -21,8 +21,8 @@ :time_ago => friendly_date_ago(common_details.timestamp), :user => changeset_user_link(common_details.changeset) %> - <%= render "changesets/changeset_line", :num_changes => nil, - :num_comments => common_details.changeset.comments.length do %> + <%= render "changesets/changeset_line", :changeset => common_details.changeset, + :show_num_changes => false do %> <%= t "browse.in_changeset" %> #<%= link_to common_details.changeset_id, common_details.changeset %> <% end %> diff --git a/app/views/changesets/_changeset.html.erb b/app/views/changesets/_changeset.html.erb index 47bcc9200..a8bb79548 100644 --- a/app/views/changesets/_changeset.html.erb +++ b/app/views/changesets/_changeset.html.erb @@ -10,8 +10,7 @@
- <%= render "changeset_line", :num_changes => changeset.num_changes, - :num_comments => changeset.comments.length do %> + <%= render "changeset_line", :changeset => changeset do %> #<%= link_to changeset.id, changeset, :class => "changeset_id link-body-emphasis" %> <% end %>
diff --git a/app/views/changesets/_changeset_line.html.erb b/app/views/changesets/_changeset_line.html.erb index e7beeb72b..4b866fd0a 100644 --- a/app/views/changesets/_changeset_line.html.erb +++ b/app/views/changesets/_changeset_line.html.erb @@ -1,9 +1,11 @@ +<%# locals: (changeset:, show_num_changes: true, show_num_comments: true) %>
<%= yield %> - <% if num_changes %> + <% if show_num_changes %> + <% num_changes = changeset.num_changes %> <%= tag.span :class => ["d-flex align-items-baseline gap-1", { "opacity-50" => num_changes.zero? }], :title => t(".changes", :count => num_changes) do %> <%= num_changes %> @@ -13,7 +15,8 @@ <% end %> <% end %> - <% if num_comments %> + <% if show_num_comments %> + <% num_comments = changeset.comments.length %> <%= tag.span :class => ["changeset_num_comments d-flex align-items-baseline gap-1 justify-content-end", { "opacity-50" => num_comments.zero? }], :title => t(".comments", :count => num_comments) do %> <%= num_comments %> -- 2.39.5