Skip to content

Commit b5f9520

Browse files
committed
fixed unnecessary duplication in suggested edit controller's category_index action & view
1 parent 54d282d commit b5f9520

2 files changed

Lines changed: 4 additions & 14 deletions

File tree

app/controllers/suggested_edit_controller.rb

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,9 @@ def category_index
1414

1515
@category = params[:category].present? ? Category.find(params[:category]) : nil
1616

17-
@edits = SuggestedEdit.where(post: Post.in(@category),
18-
active: !@show_decided)
17+
@edits = SuggestedEdit.accessible_to(current_user, @category)
18+
.where(active: !@show_decided)
1919
.order(@sort_type => @sort_order)
20-
21-
@edits_undeleted = SuggestedEdit.where(post: Post.undeleted.in(@category),
22-
active: !@show_decided)
23-
.order(@sort_type => @sort_order)
2420
end
2521

2622
def show

app/views/suggested_edit/category_index.html.erb

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,9 @@
5858
</table>
5959
</details>
6060

61-
<% if current_user&.can_see_deleted_posts?
62-
edits_list = @edits
63-
else
64-
edits_list = @edits_undeleted
65-
end %>
66-
67-
<% if edits_list.any? %>
61+
<% if @edits.any? %>
6862
<div class="widget">
69-
<% edits_list.each do |edit| %>
63+
<% @edits.each do |edit| %>
7064
<div class="widget--body h-p-b-0 <%= 'deleted-content' if edit.post.deleted? %>" data-ckb-list-item data-ckb-item-type="link">
7165
<div>
7266
<%= link_to suggested_edit_path(edit.id), class: 'has-font-size-larger', data: {'ckb-item-link' => ''} do %>

0 commit comments

Comments
 (0)