Skip to content

Commit 7500249

Browse files
committed
修正 /jobs 可能列表由于 SQL 错误为空的问题;
1 parent 0668de9 commit 7500249

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

app/controllers/jobs_controller.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ def index
99
@node = Node.find(Node.jobs_id)
1010
@suggest_topics = Topic.where(node_id: @node.id).suggest.limit(3)
1111
suggest_topic_ids = @suggest_topics.map(&:id)
12-
@topics = @node.topics.last_actived.fields_for_list.where("id NOT IN (?)", suggest_topic_ids).includes(:user).paginate(page: params[:page], per_page: 15)
12+
@topics = @node.topics.last_actived.fields_for_list
13+
@topics = @topics.where("id NOT IN (?)", suggest_topic_ids) if suggest_topic_ids.count > 0
14+
@topics = @topics.includes(:user).paginate(page: params[:page], per_page: 15)
1315
set_seo_meta("#{@node.name} » #{t('menu.topics')}", "#{Setting.app_name}#{t('menu.topics')}#{@node.name}", @node.summary)
1416
render '/topics/index'
1517
end

app/views/topics/index.html.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77

88
<div class="panel-body">
99
<% if @topics.current_page == 1 %>
10-
<% cache(@suggest_topics) do %>
10+
<% cache(['suggest_topics', @suggest_topics]) do %>
1111
<%= render partial: "topics/topic", collection: @suggest_topics, locals: { suggest: true } %>
1212
<% end %>
1313
<% end %>
1414

15-
<% cache(@topics) do %>
15+
<% cache(['topics', @topics]) do %>
1616
<%= render partial: "topics/topic", collection: @topics, locals: { suggest: false } %>
1717
<% end %>
1818
</div>

0 commit comments

Comments
 (0)