Skip to content

Commit 7becefa

Browse files
committed
招聘支持置顶,社区置顶排除隐藏的栏目,修正置顶内容缓存的问题;
1 parent c5d9de6 commit 7becefa

File tree

4 files changed

+9
-21
lines changed

4 files changed

+9
-21
lines changed

app/controllers/jobs_controller.rb

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,15 @@ def feed_node_topics_url
55
# super.feed_node_topics_url(id: 25)
66
end
77

8+
def node_id
9+
25
10+
end
11+
812
def index
9-
@node = Node.find(25)
10-
@topics = @node.topics.last_actived.fields_for_list.includes(:user).paginate(:page => params[:page],:per_page => 15)
13+
@node = Node.find(node_id)
14+
@suggest_topics = Topic.where(node_id: node_id).suggest.limit(3)
15+
suggest_topic_ids = @suggest_topics.collect(&:id)
16+
@topics = @node.topics.last_actived.fields_for_list.where(:_id.nin => suggest_topic_ids).includes(:user).paginate(:page => params[:page],:per_page => 15)
1117
set_seo_meta("#{@node.name} » #{t("menu.topics")}","#{Setting.app_name}#{t("menu.topics")}#{@node.name}",@node.summary)
1218
drop_breadcrumb("#{@node.name}")
1319
render "/topics/index"

app/controllers/topics_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class TopicsController < ApplicationController
88
before_filter :init_base_breadcrumb
99

1010
def index
11-
@suggest_topics = Topic.suggest_topics
11+
@suggest_topics = Topic.without_hide_nodes.suggest.limit(3)
1212
suggest_topic_ids = @suggest_topics.collect(&:id)
1313
@topics = Topic.last_actived.without_hide_nodes.where(:_id.nin => suggest_topic_ids).fields_for_list.includes(:user).paginate(:page => params[:page], :per_page => 15, :total_entries => 1500)
1414
set_seo_meta("","#{Setting.app_name}#{t("menu.topics")}")

app/models/topic.rb

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -140,16 +140,6 @@ def last_page_with_per_page(per_page)
140140
page = (self.replies_count.to_f / per_page).ceil
141141
page > 1 ? page : nil
142142
end
143-
144-
def self.suggest_topics
145-
key = "topic:suggest_topics:#{CacheVersion.topic_last_suggested_at}:3"
146-
topics = Rails.cache.read(key)
147-
if !topics
148-
topics = Topic.suggest.limit(3).to_a
149-
Rails.cache.write(key, topics)
150-
end
151-
topics
152-
end
153143

154144
# 所有的回复编号
155145
def reply_ids

spec/models/topic_spec.rb

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,4 @@
112112
end
113113
end
114114

115-
describe '#suggest_topics' do
116-
it 'should work' do
117-
topics = FactoryGirl.create_list(:topic, 6)
118-
Topic.should_receive(:suggest).and_return { Topic.all }
119-
expect(Topic.suggest_topics).to eq topics[0,3]
120-
end
121-
122-
end
123115
end

0 commit comments

Comments
 (0)