From 594210e172cb6880c106cdc231f156b3c3fb60ae Mon Sep 17 00:00:00 2001
From: nigel <609441862@qq.com>
Date: Mon, 13 Feb 2017 11:11:32 +0800
Subject: [PATCH] uncomments search knowledge
---
trustie2/app/controllers/relative_memos_controller.rb | 10 +++++-----
trustie2/app/views/relative_memos/search.html.erb | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/trustie2/app/controllers/relative_memos_controller.rb b/trustie2/app/controllers/relative_memos_controller.rb
index 8a059dd..f569474 100644
--- a/trustie2/app/controllers/relative_memos_controller.rb
+++ b/trustie2/app/controllers/relative_memos_controller.rb
@@ -175,11 +175,11 @@ class RelativeMemosController < ApplicationController
#order_by(:created_time, :desc)
#with(:created_time, Date.new(year,01,01)..Date.new(year+1,01,01))
- any_of do
- # with :parent_id, 0
- # with :parent_id, nil
- with :source, params[:name].downcase
- end
+ # any_of do
+ # # with :parent_id, 0
+ # # with :parent_id, nil
+ # with :source, params[:name].downcase
+ # end
paginate :page => params[:page], :per_page => per_page_option
end
@topics = search.results
diff --git a/trustie2/app/views/relative_memos/search.html.erb b/trustie2/app/views/relative_memos/search.html.erb
index 3ca5c13..d07a723 100644
--- a/trustie2/app/views/relative_memos/search.html.erb
+++ b/trustie2/app/views/relative_memos/search.html.erb
@@ -255,13 +255,13 @@
<%= content_tag('span', l(:label_review_num)) %>
-
+
- <%= topic.collection_num %>
+ <%#= topic.collection_num %>
- <%= content_tag('span', l(:label_collection_num)) %>
-
+ <%#= content_tag('span', l(:label_collection_num)) %>
+ -->
@@ -297,7 +297,7 @@
<%= content_tag('span', "帖子来源：") %><%= link_to topic.url, topic.url, :onclick => "return user_trace_click_knowledge_in_knowledge_list_after_search('#{topic.id}','#{@topics_pages.page}','#{i+1}','#{request.session_options[:id]}');" %>
-
+