From 0db69e1ebfc991a88f3785bf2b19f1a885660d17 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 20 Jan 2016 16:32:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=AF=BE=E7=A8=8B=E5=AF=BC?=
 =?UTF-8?q?=E8=AF=AD=E6=97=B6=E9=97=B4=E5=92=8C=E8=AF=BE=E7=A8=8B=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E5=8A=A8=E6=80=81=E6=97=B6=E9=97=B4=E4=B8=80=E8=87=B4?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/courses_helper.rb |  2 +-
 app/models/course.rb          | 10 +---------
 app/models/course_activity.rb |  4 +++-
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index 13d8e99b6..7b7bcbcf4 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -37,7 +37,7 @@ module CoursesHelper
     a_courses = []
     courses = Course.search(keywords)
     courses.each do |c|
-      a_courses << c.id unless current_course.id != c.id
+      a_courses << c.id
     end
     a_courses << a_tags unless a_tags.length == 0
     # 过滤条件：精品课程、本身不在搜索范围
diff --git a/app/models/course.rb b/app/models/course.rb
index e715e9198..0d663b19a 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -72,7 +72,7 @@ class Course < ActiveRecord::Base
   before_save :self_validate
   # 公开课程变成私有课程，所有资源都变成私有
   after_update :update_files_public,:update_course_ealasticsearch_index,:update_activity
-  after_create :create_board_sync, :act_as_course_activity, :act_as_course_message,:create_course_ealasticsearch_index, :add_course_ead
+  after_create :create_board_sync, :act_as_course_activity, :act_as_course_message,:create_course_ealasticsearch_index
   before_destroy :delete_all_members,:delete_course_ealasticsearch_index
 
   safe_attributes 'extra',
@@ -405,14 +405,6 @@ class Course < ActiveRecord::Base
     self.course_messages << CourseMessage.new(:user_id => self.tea_id, :course_id => self.id, :viewed => false)
   end
 
-  # 发布新课导语
-  def add_course_ead
-    name = Redmine::Configuration['course_message_lead_subject']
-    content = Redmine::Configuration['course_message_lead_content']
-    # message的status状态为0为正常，为1表示创建课程时发送的message
-    Message.create(:subject => name, :content => content, :board_id => self.boards.first.id, :author_id => self.tea_id , :sticky => true, :status => true )
-  end
-
   #项目与课程分离后，很多课程的名称等信息为空，这些数据信息存储在项目表中！！就是数据兼容的问题
   #def name
   #  read_attribute('name') || Project.find_by_identifier(self.extra).try(:name)
diff --git a/app/models/course_activity.rb b/app/models/course_activity.rb
index 88351acfd..194e1183a 100644
--- a/app/models/course_activity.rb
+++ b/app/models/course_activity.rb
@@ -70,7 +70,9 @@ class CourseActivity < ActiveRecord::Base
       name = Redmine::Configuration['course_message_lead_subject']
       content = Redmine::Configuration['course_message_lead_content']
       # message的status状态为0为正常，为1表示创建课程时发送的message
-      Message.create(:subject => name, :content => content, :board_id => self.course.boards.first.id, :author_id => self.course.tea_id , :sticky => true, :status => true )
+      message = Message.create(:subject => name, :content => content, :board_id => self.course.boards.first.id, :author_id => self.course.tea_id , :sticky => true, :status => true )
+      # 更新的目的是为了排序，因为该条动态的时间可能与课程创建的动态创建时间一直
+      message.course_acts.first.update_attribute(:updated_at, message.course_acts.first.updated_at + 1)
     end
   end
 end