搜索文件归属，课程相关逻辑修改，查询把过滤去掉了。暂时没想有什么过滤的好办法

app/controllers/stores_controller.rb

@@ -20,25 +20,27 @@ class StoresController < ApplicationController
     resultSet = Attachment.where("attachments.container_type IS NOT NULL AND filename LIKE :like ", like: "%#{keywords}%").
               reorder("created_on DESC")
     
-    result = resultSet.to_a.dup
+    # result = resultSet.to_a.dup
 
-    resultSet.to_a.map { |res|
-      if(res.container.nil? || 
-        (res.container.class.to_s=="Project" && res.container.is_public == false) ||
-        (res.container.has_attribute?(:project) && res.container.project.is_public == false) ||
-        (res.container.class.to_s=="HomeworkAttach" && res.container.bid.reward_type == 3) ||
-        false
-        )
-        result.delete(res)
-      end
-    }
-    result
+    # resultSet.to_a.map { |res|
+    #   if(res.container.nil? || 
+    #     (res.container.class.to_s=="Project" && res.container.is_public == false) ||
+    #     (res.container.has_attribute?(:project) && res.container.project.is_public == false) ||
+    #     (res.container.class.to_s=="HomeworkAttach" && res.container.bid.reward_type == 3) ||
+    #     false
+    #     )
+    #     result.delete(res)
+    #   end
+    # }
+    # result
   end
 
   LIMIT = 12 unless const_defined?(:LIMIT)
   def index
     @projects_attach = project_classification(0).take(LIMIT)
-    @courses_attach = project_classification(1).take(LIMIT)
+    @courses_attach = Attachment.includes(:course).where("courses.is_public = ?", 1).
+                      where(container_type: 'Course').
+                      limit(LIMIT)
     # @projects_attach = Attachment.includes(:project).where("projects.project_type=? AND projects.is_public = ?", 0, 1).
     #           reorder("#{Attachment.table_name}.downloads DESC").
     #           limit(LIMIT)

app/helpers/attachments_helper.rb

@@ -110,7 +110,7 @@ module AttachmentsHelper
 
     # 搜索到的资源
     searched_attach = domain.where("filename LIKE :like ", like:"%#{filename_condition}%").limit(limit).order('created_on desc')
-    searched_attach = private_filter searched_attach
+    #searched_attach = private_filter searched_attach
     searched_attach = paginateHelper(searched_attach, 10)
 
     s = content_tag('div', attachments_check_box_tags('attachment[attach][]', searched_attach), :id => 'attachments')
@@ -149,7 +149,7 @@ module AttachmentsHelper
 
     # 搜索到的资源
     searched_attach = domain.where("filename LIKE :like ", like:"%#{filename_condition}%").limit(limit).order('created_on desc')
-    searched_attach = private_filter searched_attach
+    #searched_attach = private_filter searched_attach
     searched_attach = paginateHelper(searched_attach, 10)
 
     #testattach = Attachment.public_attachments

app/helpers/stores_helper.rb

@@ -37,15 +37,24 @@ module StoresHelper
 
 	WORD_LIMIT = 100
 	def come_from_local attachment
-
 		container = attachment.container
 		case container.class.to_s
 		when 'Message'
+				# binding.pry
 			# '项目 > zzz > 论坛 > 帖子xxx'
 			# topic_str = container.project.project_type == 0 ? l(:label_board) : l(:label_new_course)
+
+			course = container.course
+			project = container.project
+			if course.nil? # container is belongs to Project
 				topic_list = link_to l(:label_board), project_boards_path(container.project)
 				topic_item = link_to container.subject.truncate(WORD_LIMIT, omission: '...'), board_message_path(container.board, container), title: container.subject
 				project_link(container.project).push(topic_list, topic_item)
+			else # container is belongs to Course
+				topic_list = link_to l(:label_course_news), course_boards_path(course)
+				topic_item = link_to container.try(:subject).to_s.truncate(WORD_LIMIT, omission: '...'), board_message_path(container.board, container), title: container.subject
+				project_link(course).push(topic_list, topic_item)
+			end
 		when 'Issue'
 			# '项目 > zzz > 缺陷 > 问题xxx'
 			issue_list = link_to l(:label_project_issues),  project_issues_path(container.project)
@@ -58,15 +67,26 @@ module StoresHelper
 			project_link(container.project).push(doc_list, doc_item)
 		when 'News'
 			# '课程 > zzz > 新闻 > 新闻xxx'
-			news_str = container.project.project_type == 0 ? l(:label_news) : l(:label_course_news)
-			news_list = link_to news_str, project_news_index_path(container.project)
+			course = container.course
+			project = container.project
+			if course.nil? # container is belongs to Project
+				news_list = link_to l(:label_news), project_news_index_path(container.project)
 				news_item = link_to container.title.truncate(WORD_LIMIT, omission: '...'), news_path(container), title: container.title
 				project_link(container.project).push(news_list, news_item)
+			else # container is belongs to Course
+				news_list = link_to l(:label_course_news), course_news_index_path(course)
+				news_item = link_to container.title.truncate(WORD_LIMIT, omission: '...'), news_path(container), title: container.title
+				project_link(course).push(news_list, news_item)
+			end
+
 		when 'Project'
 			# '项目 > zzz '
 			file_str = container.project.project_type == 0 ? l(:project_module_files) : l(:label_course_file)
 			files_list = link_to file_str, project_files_path(container.project)
 			project_link(container).push(files_list)
+		when 'Course'
+			files_list = link_to l(:label_course_file), course_files_path(container)
+			project_link(container).push(files_list)
 		when 'Version'
 			# '项目 > zzz > 里程碑 > xxx'
 			ver_list = link_to l(:label_roadmap), project_roadmap_path(container.project)
@@ -91,7 +111,8 @@ module StoresHelper
 			# '竞赛 > xxx '
 			bid_link(container)
 		else
-			Rails.logger.error "ERROR: attachment type unkown"
+			Rails.logger.error "ERROR: attachment type unkown. file:#{__FILE__}, line:#{__LINE__}"
+			Rails.logger.error "#{container.class.to_s}"
 			[link_to('unkown', '')]
 		end
 	rescue ActionController::RoutingError => e
@@ -99,20 +120,6 @@ module StoresHelper
 		[link_to('unkown', '')]
 	end
 
-	def project_link project
-		if project.nil?
-			Rails.logger.error  "ERROR: attachment type unkown #project_link project.nil?" 
-			return [link_to('unkown', '')]
-		end
-		project_list = nil
-		if project.project_type == 0
-			project_list = link_to l(:label_project_plural), projects_path
-		else
-			project_list = link_to l(:label_new_course), course_path
-		end
-		project_item = link_to project.to_s, project_path(project)
-		[project_list, project_item]
-	end
 
 	def bid_link bid
 		bid_list = nil
@@ -129,7 +136,7 @@ module StoresHelper
 				Rails.logger.error  "ERROR: attachment type unkown #bid_link/when 3" 
 				return [link_to('unkown', '#')] 
 			end
-			bid_list = link_to l(:label_homework), project_homework_path(bid.courses.first)
+			bid_list = link_to l(:label_homework), homework_course_path(bid.courses.first)
 			bid_item = link_to bid.name, respond_path(bid)
 			return project_link(bid.courses.first).push(bid_list, bid_item)
 		else
@@ -137,4 +144,28 @@ module StoresHelper
 		end
 		[bid_list, bid_item]
 	end
+
+
+	def project_link project
+		if project.nil?
+			Rails.logger.error  "ERROR: attachment type unkown #project_link project.nil? file: #{__FILE__}, line: #{__LINE__}" 
+			return [link_to('unkown', '')]
+		end
+		project_list = nil
+		klass = project.class.to_s
+		case klass
+		when "Project"
+			project_list = link_to l(:label_project_plural), projects_path
+			project_item = link_to project.to_s, project_path(project)
+			[project_list, project_item]
+		when "Course"
+			course_list = link_to l(:label_new_course), courses_path
+			course_item = link_to project.name, course_path(project)
+			[course_list, course_item]
+		else
+			Rails.logger.error "[StoresHelper]: #{klass}   ======================================="
+			[]
+		end
+
+	end
 end

app/views/layouts/_base_footer.html.erb

@@ -29,8 +29,9 @@
 </div>
 </div>
 </div>
-<div class="debug hidden">
+<div class="debug">
   <%= debug(params) if Rails.env.development? %>
+  <div class="hidden">
 
     <script src="http://s4.cnzz.com/z_stat.php?id=1000482288&web_id=1000482288" language="JavaScript"></script>
     <script>
@@ -44,6 +45,7 @@
     ga('send', 'pageview');
 
     </script>
+  </div>
 </div>
 
 <% end %>