Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/controllers/pseuds_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ def index
@pseuds = @user.pseuds.with_attached_icon.alphabetical.paginate(page: params[:page])
@rec_counts = Pseud.rec_counts_for_pseuds(@pseuds)
@work_counts = Pseud.work_counts_for_pseuds(@pseuds)
@pseuds_with_works = Pseud.has_works_for(@pseuds.collect(&:id)) if @user == current_user
@page_subtitle = @user.login
end

Expand Down
7 changes: 7 additions & 0 deletions app/models/pseud.rb
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,13 @@ def to_param
).group('pseuds.id')
}

scope :has_works_for, lambda { |pseud_ids|
joins(:works)
.where(pseuds: { id: pseud_ids })
.distinct
.pluck(:id)
}

scope :public_rec_count_for, -> (pseud_ids) {
select('pseuds.id, count(pseuds.id) AS rec_count')
.joins(:bookmarks)
Expand Down
2 changes: 1 addition & 1 deletion app/views/pseuds/_pseud_blurb.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
edit_user_pseud_path(@user, pseud),
id: "edit_#{pseud.name.downcase.gsub(' ', '_')}"
) %></li>
<% if pseud.works.present? && current_user == pseud.user %>
<% if current_user == pseud.user && @pseuds_with_works.include?(pseud.id) %>
<li><%= link_to(
t(".orphan_html",
landmark_span: content_tag(:span,
Expand Down
3 changes: 1 addition & 2 deletions spec/requests/pseuds_n_plus_one_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@

warmup { subject.call }

# TODO: https://otwarchive.atlassian.net/browse/AO3-6738
xit "produces a constant number of queries" do
it "produces a constant number of queries" do
expect { subject.call }
.to perform_constant_number_of_queries
end
Expand Down
Loading