Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh

2015-12-18 09:39:55 +08:00 · 2015-12-18 09:39:55 +08:00 · b34b1181b7
parent 4ca177970b 38c3422b83
commit b34b1181b7
71 changed files with 574 additions and 139 deletions
--- a/app/controllers/at_controller.rb
+++ b/app/controllers/at_controller.rb
@ -0,0 +1,152 @@
+#coding=utf-8
+
+class AtController < ApplicationController
+  respond_to :json
+
+  def show
+    @logger = Logger.new(Rails.root.join('log', 'at.log').to_s)
+    users = find_at_users(params[:type], params[:id])
+    @users = users
+    @users = users.uniq { |u| u.id }.delete_if { |u| u.id == User.current.id } if users
+  end
+
+  private
+  def find_at_users(type, id)
+    @logger.info("#{type}, #{id}")
+    case type
+      when "Issue"
+        find_issue(id)
+      when 'Project'
+        find_project(id)
+      when 'Course'
+        find_course(id)
+      when 'Activity', 'CourseActivity', 'ForgeActivity','UserActivity', 'OrgActivity','PrincipalActivity'
+        find_activity(id, type)
+      when 'Attachment'
+        find_attachment(id)
+      when 'Message'
+        find_message(id)
+      when 'HomeworkCommon'
+        find_homework(id)
+      when 'Topic'
+        find_topic(id)
+      else
+        nil
+    end
+  end
+
+  def find_topic(id)
+
+  end
+
+  def find_issue(id)
+    #1. issues list persons
+    #2. project persons
+    issue = Issue.find(id)
+    journals = issue.journals
+    at_persons = journals.map(&:user) + issue.project.users
+    at_persons.uniq { |u| u.id }.delete_if { |u| u.id == User.current.id }
+  end
+
+  def find_project(id)
+    at_persons = Project.find(id).users
+    at_persons.delete_if { |u| u.id == User.current.id }
+  end
+
+  def find_course(id)
+    at_persons = Course.find(id).users
+    at_persons.delete_if { |u| u.id == User.current.id }
+  end
+
+  def find_activity(id, type)
+
+    ## 基本上是本类型中的 加上所属类型的用户
+    case type
+      when 'Activity'
+        activity = Activity.find(id)
+        (find_at_users(activity.act_type, activity.act_id) ||[]) +
+            (find_at_users(activity.activity_container_type, activity.activity_container_id) || [])
+      when 'CourseActivity'
+        activity = CourseActivity.find(id)
+        (find_at_users(activity.course_act_type, activity.course_act_id) || []) + (find_course(activity.course.id) || [])
+      when 'ForgeActivity'
+        activity = ForgeActivity.find(id)
+        (find_at_users(activity.forge_act_type, activity.forge_act_id) ||[]) +
+            (find_project(activity.project_id) || [])
+      when 'UserActivity'
+        activity = UserActivity.find(id)
+        (find_at_users(activity.act_type, activity.act_id) || []) +
+            (find_at_users(activity.container_type, activity.container_id) || [])
+      when 'OrgActivity'
+        activity = OrgActivity.find(id)
+        (find_at_users(activity.org_act_type, activity.org_act_id) || []) +
+            (find_at_users(activity.container_type, activity.container_id) || [])
+      when 'PrincipalActivity'
+        activity = PrincipalActivity.find(id)
+        find_at_users(activity.principal_act_type, activity.principal_act_id)
+      else
+        nil
+    end
+  end
+
+  #作业应该是关联课程,取课程的用户列表
+  def find_homework(id)
+    homework = HomeworkCommon.find(id)
+    find_course(homework.course_id)
+  end
+
+  def find_attachment(id)
+    attachment = Attachment.find(id)
+    find_at_users(attachment.container_type, attachment.container_id)
+  end
+
+  #Message
+  def find_message(id)
+    message = Message.find(id)
+    at_persons =  message.board.messages.map(&:author)
+    (at_persons || []) + (find_project(message.board.project_id)||[])
+  end
+
+  #News
+  def find_news(id)
+    find_project(News.find(id).project_id)
+  end
+
+  #JournalsForMessage
+  def find_journals_for_message(id)
+    jounrnal = JournalsForMessage.find(id)
+    find_at_users(jounrnal.jour_type, jounrnal.jour_id)
+  end
+
+  #Poll
+  def find_poll(id)
+  end
+
+  #Journal
+  def find_journal(id)
+    journal = Journal.find(id)
+    find_at_users(journal.journalized_type, journal.journalized_id)
+  end
+
+  #Document
+  def find_document(id)
+    find_project(Document.find(id).project_id)
+  end
+
+  #ProjectCreateInfo
+  def find_project_create_info(id)
+
+  end
+
+  #Principal
+  def find_principal(id)
+
+  end
+
+  #BlogComment
+  def find_blog_comment(id)
+    blog = BlogComment.find(id).blog
+    blog.users
+  end
+
+end
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@ -79,6 +79,13 @@ class BoardsController < ApplicationController
          end
        end
      end
+
+      @project.boards.each do |board|
+        board.messages.each do |m|
+          User.current.at_messages.unviewed('Message', m.id).each {|x| x.viewed!}
+        end
+      end
+
    elsif @course
      query_course_messages = @board.messages
      query_course_messages.each do |query_course_message|
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@ -19,6 +19,14 @@ class HomeworkCommonController < ApplicationController
    @is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course))
    @is_student = User.current.logged? && (User.current.admin? || (User.current.member_of_course?(@course) && !@is_teacher))
    @is_new = params[:is_new]
+
+    #设置at已读
+    @homeworks.each do |homework|
+      homework.journals_for_messages.each do |j|
+        User.current.at_messages.unviewed('JournalsForMessage', j.id).each {|x| x.viewed!}
+      end
+    end
+
    respond_to do |format|
      format.js
      format.html
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@ -118,6 +118,14 @@ class IssuesController < ApplicationController
    # 当前用户查看指派给他的缺陷消息，则设置消息为已读
    query = ForgeMessage.where("forge_message_type =? and user_id =? and forge_message_id =?", "Issue", User.current, @issue).first
    query.update_attribute(:viewed, true) unless query.nil?
+
+    # issue 新建的at消息
+    User.current.at_messages.unviewed('Issue', @issue.id).each {|x| x.viewed!}
+    # 回复的at消息
+    @issue.journals.each do |j|
+      User.current.at_messages.unviewed('Journal', j.id).each {|x| x.viewed!}
+    end
+
    # 缺陷状态更新
    query_journals = @issue.journals
      query_journals.each do |query_journal|
@ -145,24 +153,17 @@ class IssuesController < ApplicationController
    @project_base_tag = (params[:project_id] || @issue.project) ? 'base_projects':'base'#by young
    @available_watchers = (@issue.project.users.sort + @issue.watcher_users).uniq

-    #id name email
-    #1. issues list persons
-    #2. project persons
-    @at_persons = @journals.map(&:user) + @issue.project.users
-    @at_persons = @at_persons.uniq{|u| u.id}.delete_if{|u| u.id == User.current.id}
-    @at_persons = nil
-
-    respond_to do |format|``
-    format.html {
-      retrieve_previous_and_next_issue_ids
-      render :template => 'issues/show', :layout => @project_base_tag#by young
-    }
-    format.api
-    format.atom { render :template => 'journals/index', :layout => false, :content_type => 'application/atom+xml' }
-    format.pdf  {
-      pdf = issue_to_pdf(@issue, :journals => @journals)
-      send_data(pdf, :type => 'application/pdf', :filename => filename_for_content_disposition("#{@project.identifier}-#{@issue.id}.pdf") )
-    }
+    respond_to do |format|
+      format.html {
+        retrieve_previous_and_next_issue_ids
+        render :template => 'issues/show', :layout => @project_base_tag#by young
+      }
+      format.api
+      format.atom { render :template => 'journals/index', :layout => false, :content_type => 'application/atom+xml' }
+      format.pdf  {
+        pdf = issue_to_pdf(@issue, :journals => @journals)
+        send_data(pdf, :type => 'application/pdf', :filename => filename_for_content_disposition("#{@project.identifier}-#{@issue.id}.pdf") )
+      }
    end
  end

--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -1752,6 +1752,13 @@ module ApplicationHelper
  #
  def javascript_include_tag(*sources)
    options = sources.last.is_a?(Hash) ? sources.pop : {}
+
+    @sources ||= []
+    sources = sources.delete_if do|source|
+      @sources.include?(source)
+    end
+    @sources += sources
+
    if plugin = options.delete(:plugin)
      sources = sources.map do |source|
        if plugin
@ -1761,7 +1768,12 @@ module ApplicationHelper
        end
      end
    end
-    super sources, options
+
+     if sources && !sources.empty?
+       super(sources, options)
+     else
+       ''
+     end
  end

  def content_for(name, content = nil, &block)
@ -2712,19 +2724,8 @@ int main(int argc, char** argv){
  end

  def import_ke(default_opt={})
-    opt = {enable_at: true, prettify: false, init_activity: false}.merge default_opt
+    opt = {enable_at: false, prettify: false, init_activity: false}.merge default_opt
    ss  = ''
-    if opt[:enable_at]
-      ss = '<script type="text/javascript">'
-      ss += 'window.atPersonLists = [];'
-
-      @at_persons && @at_persons.each_with_index do |person,index|
-        ss += "var o = {id: #{index}, name: '#{person.show_name}', login: '#{person.login}', searchKey: '#{person.get_at_show_name}'};"
-        ss += "atPersonLists.push(o);"
-      end
-
-      ss += "</script>"
-    end

    ss += javascript_include_tag("/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg')
    if opt[:enable_at]
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@ -89,7 +89,8 @@ module UsersHelper
    forge_count = ForgeMessage.where("user_id =? and viewed =?", user, 0).count
    user_feedback_count = UserFeedbackMessage.where("user_id =? and viewed =?", user, 0).count
    user_memo_count = MemoMessage.where("user_id =? and viewed =?", user, 0).count
-    messages_count = course_count + forge_count + user_feedback_count + user_memo_count
+    at_count = user.at_messages.where(viewed: false).count
+    messages_count = course_count + forge_count + user_feedback_count + user_memo_count + at_count
  end

  def user_mail_notification_options(user)
--- a/app/models/at_message.rb
+++ b/app/models/at_message.rb
@ -0,0 +1,102 @@
+#coding=utf-8
+
+class AtMessage < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :sender, class_name: "User", foreign_key: "sender_id"
+  attr_accessible :at_message, :container, :viewed, :user_id, :sender_id
+  belongs_to :at_message, polymorphic: true
+  belongs_to :container, polymorphic: true
+
+  has_many :message_alls, :class_name => 'MessageAll',:as =>:message, :dependent => :destroy
+  validates :user_id, :sender_id, :at_message_id, :at_message_type, presence: true
+
+  after_create :add_user_message
+
+  scope :unviewed, ->(type, id){
+    where(at_message_type: type, at_message_id:id, viewed: false)
+  }
+
+  def viewed!
+    update_attribute :viewed, true
+  end
+
+  def at_valid?
+    return true if at_message_type == 'Issue'
+    return true if 'Journal' == at_message_type
+    return true if 'JournalsForMessage' == at_message_type
+    return true if 'Message' == at_message_type
+    false
+  end
+
+  def add_user_message
+    if MessageAll.where(message_type: self.class.name,message_id: self.id).empty?
+      self.message_alls << MessageAll.new(:user_id => self.user_id)
+    end
+  end
+
+  def subject
+    case at_message_type
+      when "Issue"
+        "新建问题: " + at_message.subject
+      when "Journal"
+        "问题留言: " + at_message.journalized.subject
+      when 'Message'
+        if(at_message.topic?)
+          "发布新帖: "
+        else
+          "回复帖子: "
+        end +  at_message.subject
+      when 'JournalsForMessage'
+        "作业留言: " + at_message.jour.description
+      else
+        logger.error "error type: #{at_message_type}"
+    end
+  end
+
+  def description
+    case at_message_type
+      when "Issue"
+        at_message.description
+      when "Journal"
+        at_message.notes
+      when 'Message'
+        at_message.content
+      when "JournalsForMessage"
+        at_message.notes
+      else
+        logger.error "error type: #{at_message_type}"
+    end
+  end
+
+  def author
+    case at_message_type
+      when "Issue"
+        at_message.author
+      when "Journal"
+        at_message.user
+      when 'Message'
+        at_message.author
+      when 'JournalsForMessage'
+        at_message.user
+      else
+        logger.error "error type: #{at_message_type}"
+    end
+  end
+
+  def url
+    case at_message_type
+      when "Issue"
+        {controller: :issues, action: :show, id: at_message}
+      when "Journal"
+        {controller: :issues, action: :show, id: at_message.journalized}
+      when 'Message'
+        {controller: :boards, action: :show, project_id: at_message.board.project, id: at_message.board}
+      when 'JournalsForMessage'
+        {controller: :homework_common, action: :index, course: at_message.jour.course_id}
+      else
+        logger.error "error type: #{at_message_type}"
+    end
+
+  end
+
+end
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@ -52,6 +52,7 @@ class Issue < ActiveRecord::Base
  # ForgeMessage虚拟关联(多态)
  has_many :forge_messages, :class_name => 'ForgeMessage',:as =>:forge_message ,:dependent => :destroy

+  has_many :at_messages, class_name: 'AtMessage', as: :at_message ,:dependent => :destroy

  acts_as_nested_set :scope => 'root_id', :dependent => :destroy
  acts_as_attachable :before_add => :attachment_added, :after_remove => :attachment_removed
@ -82,7 +83,7 @@ class Issue < ActiveRecord::Base
  attr_reader :current_journal
  
  # fq
-  after_create :act_as_activity,:be_user_score_new_issue,:act_as_forge_activity, :act_as_forge_message
+  after_create :act_as_activity,:be_user_score_new_issue,:act_as_forge_activity, :act_as_forge_message, :act_as_at_message
  after_update :be_user_score
  after_destroy :down_user_score
  # after_create :be_user_score
@ -156,6 +157,14 @@ class Issue < ActiveRecord::Base
    end
  end

+  # at 功能添加消息提醒
+  def act_as_at_message
+    users = self.description.scan /<span class="at" data-user-id="(\d+?)">/m
+    users && users.flatten.uniq.each do |uid|
+      self.at_messages << AtMessage.new(user_id: uid, sender_id: self.author_id)
+    end
+  end
+
  # 更新缺陷
  #def act_as_forge_message_update
  #  unless self.author_id == self.assigned_to_id
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@ -31,7 +31,9 @@ class Journal < ActiveRecord::Base
  has_many :forge_acts, :class_name => 'ForgeActivity',:as =>:forge_act ,:dependent => :destroy
  # 被ForgeMessage虚拟关联
  has_many :forge_messages, :class_name => 'ForgeMessage',:as =>:forge_message ,:dependent => :destroy
-  # end
+
+  has_many :at_messages, as: :at_message, dependent: :destroy
+
  attr_accessor :indice

  acts_as_event :title =>Proc.new {|o| status = ((s = o.new_status) ? " (#{s})" : nil); "#{o.issue.tracker} ##{o.issue.project_index}#{status}: #{o.issue.subject}" },
@ -50,7 +52,7 @@ class Journal < ActiveRecord::Base
  before_create :split_private_notes
  
  # fq
-  after_save :act_as_activity,:be_user_score,:act_as_forge_activity, :act_as_forge_message
+  after_save :act_as_activity,:be_user_score,:act_as_forge_activity, :act_as_forge_message, :act_as_at_message
  # end
  #after_destroy :down_user_score
  #before_save :be_user_score
@ -184,6 +186,13 @@ class Journal < ActiveRecord::Base
    end
  end

+  def act_as_at_message
+    users = self.notes.scan /<span class="at" data-user-id="(\d+?)">/m
+    users && users.flatten.uniq.each do |uid|
+      self.at_messages << AtMessage.new(user_id: uid, sender_id: self.user_id)
+    end
+  end
+
  # 更新用户分数     -by zjc
  def be_user_score
      #新建了缺陷留言且留言不为空，不为空白
--- a/app/models/journals_for_message.rb
+++ b/app/models/journals_for_message.rb
@ -64,8 +64,10 @@ class JournalsForMessage < ActiveRecord::Base
  has_many :course_messages, :class_name => 'CourseMessage',:as =>:course_message ,:dependent => :destroy
  has_many :user_feedback_messages, :class_name => 'UserFeedbackMessage', :as =>:journals_for_message, :dependent => :destroy

+  has_many :at_messages, as: :at_message, dependent: :destroy
+
  validates :notes, presence: true, if: :is_homework_jour?
-  after_create :act_as_activity, :act_as_course_activity, :act_as_course_message, :act_as_user_feedback_message, :act_as_principal_activity, :act_as_student_score
+  after_create :act_as_activity, :act_as_course_activity, :act_as_course_message, :act_as_at_message, :act_as_user_feedback_message, :act_as_principal_activity, :act_as_student_score
  after_create :reset_counters!
  after_destroy :reset_counters!
  after_save :be_user_score
@ -240,6 +242,12 @@ class JournalsForMessage < ActiveRecord::Base
    end
  end

+  def act_as_at_message
+    users = self.notes.scan /<span class="at" data-user-id="(\d+?)">/m
+    users && users.flatten.uniq.each do |uid|
+      self.at_messages << AtMessage.new(user_id: uid, sender_id: self.user_id)
+    end
+  end
  # 用户留言消息通知
  def act_as_user_feedback_message
    # 主留言
--- a/app/models/message.rb
+++ b/app/models/message.rb
@ -38,7 +38,7 @@ class Message < ActiveRecord::Base
  # 课程/项目 消息
  has_many :course_messages, :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy
  has_many :forge_messages, :class_name => 'ForgeMessage', :as => :forge_message, :dependent => :destroy
-  #end
+  has_many :at_messages, as: :at_message, dependent: :destroy

  has_many :ActivityNotifies,:as => :activity, :dependent => :destroy

@ -74,7 +74,7 @@ class Message < ActiveRecord::Base
  after_update :update_messages_board
  after_destroy :reset_counters!,:down_user_score,:delete_kindeditor_assets
  
-  after_create :act_as_activity,:act_as_course_activity,:be_user_score,:act_as_forge_activity, :act_as_system_message, :send_mail, :act_as_student_score
+  after_create :act_as_activity,:act_as_course_activity,:be_user_score,:act_as_forge_activity, :act_as_system_message, :send_mail, :act_as_student_score, :act_as_at_message
  #before_save :be_user_score

  scope :visible, lambda {|*args|
@ -96,6 +96,10 @@ class Message < ActiveRecord::Base
      end
    }

+  def topic?
+    parent_id.nil?
+  end
+
  def visible?(user=User.current)
    if project
      !user.nil? && user.allowed_to?(:view_messages, project)
@ -237,6 +241,13 @@ class Message < ActiveRecord::Base
      end
    end
  end
+
+  def act_as_at_message
+    users = self.content.scan /<span class="at" data-user-id="(\d+?)">/m
+    users && users.flatten.uniq.each do |uid|
+      self.at_messages << AtMessage.new(user_id: uid, sender_id: self.author_id)
+    end
+  end
  
  #更新用户分数     -by zjc
  def be_user_score
--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -161,6 +161,7 @@ class User < Principal
  has_many :user_feedback_messages
  has_one :onclick_time
  has_many :system_messages
+  has_many :at_messages

 # 虚拟转换
  has_many :new_jours, :as => :jour, :class_name => 'JournalsForMessage', :conditions => "status=1"
@ -400,16 +401,7 @@ class User < Principal
  end
  
  def show_name
-    name = ""
-    unless self.user_extensions.nil?
-      if self.user_extensions.identity == 2
-        name = firstname
-      else
-        name = lastname+firstname
-      end
-    else
-      name = lastname+firstname
-    end
+    name = lastname + firstname
    name.empty? || name.nil? ? login : name
  end
  ## end
--- a/app/views/at/show.json.erb
+++ b/app/views/at/show.json.erb
@ -0,0 +1,6 @@
+[
+  <% @users && @users.each_with_index do |person,index| %>
+  {"id":<%=index%>, "userid": <%=person.id%>, "name": "<%=person.show_name%>", "login": "<%=person.login%>", "searchKey": "<%=person.get_at_show_name%>"}
+  <%= index != @users.size-1 ? ',' : '' %>
+  <% end %>
+]
--- a/app/views/bids/_new_homework_form.html.erb
+++ b/app/views/bids/_new_homework_form.html.erb
@ -15,10 +15,10 @@
      <label class="fl" >&nbsp;&nbsp;<%= l(:field_quote)%>&nbsp;&nbsp;：</label>
      <!--<textarea  name="bid[description]" placeholder="最多3000个汉字(或6000个英文字符)"  class="hwork_text fl"></textarea>-->
      <% if edit_mode %>
-        <%= f.kindeditor :description,:width=>'91%',:editor_id => 'bid_description_editor',:owner_id => bid.id,:owner_type =>OwnerTypeHelper::BID,:resizeType => 0 %>
+        <%= f.kindeditor :description,:width=>'91%',:editor_id => 'bid_description_editor',:owner_id => bid.id,:owner_type =>OwnerTypeHelper::BID,:resizeType => 0,act_id: @course.id, act_type: @course.class.to_s %>
      <% else %>
          <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
-          <%= f.kindeditor :description,:width=>'91%',:editor_id => 'bid_description_editor',:resizeType => 0 %>
+          <%= f.kindeditor :description,:width=>'91%',:editor_id => 'bid_description_editor',:resizeType => 0, act_id: @course.id, act_type: @course.class.to_s %>
      <% end %>
    </li>
    <div class="cl"></div>
--- a/app/views/blog_comments/_edit.html.erb
+++ b/app/views/blog_comments/_edit.html.erb
@ -1,5 +1,5 @@
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false) %>
+    <%= import_ke(enable_at: true, prettify: false) %>
    <%= javascript_include_tag 'blog' %>
 <% end %>

@ -34,7 +34,9 @@
                           :class => 'talk_text fl',
                           :input_html => { :id => 'message_content',
                                            :class => 'talk_text fl',
-                                            :maxlength => 5000 }%>
+                                            :maxlength => 5000 },
+                           act_id: article.id, act_type: article.class.to_s
+          %>
          <div class="cl"></div>
          <p id="message_content_span"></p>
        </div>
--- a/app/views/blog_comments/_reply_form.html.erb
+++ b/app/views/blog_comments/_reply_form.html.erb
@ -1,5 +1,5 @@
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false) %>
+    <%= import_ke(enable_at: true, prettify: false) %>
 <% end %>
 <li>
  <div style="display: none ;" class="fl"><label><span class="c_red">*</span>&nbsp;<%= l(:field_subject) %>&nbsp;&nbsp;：</label></div>
@ -27,7 +27,9 @@
                       :minHeight=>100,
                       :input_html => { :id => 'message_content',
                                        :class => 'talk_text fl',
-                                        :maxlength => 5000 }%>
+                                        :maxlength => 5000 },
+                       at_id: article.id, at_type: article.class.to_s
+      %>
  <div class="cl"></div>
  <p id="message_content_span"></p>
 </li>
--- a/app/views/blog_comments/quote.js.erb
+++ b/app/views/blog_comments/quote.js.erb
@ -3,7 +3,7 @@ if($("#reply_message_<%= @blogComment.id%>").length > 0) {
    $(function(){
        $('#reply_subject').val("<%= raw escape_javascript(@subject) %>");
        $('#quote_quote').val("<%= raw escape_javascript(@temp.content.html_safe) %>");
-        init_activity_KindEditor_data(<%= @blogComment.id%>,null,"85%");
+        init_activity_KindEditor_data(<%= @blogComment.id%>,null,"85%", "<%=@blogComment.class.to_s%>");
    });
 }else if($("#reply_to_message_<%= @blogComment.id%>").length >0) {
    $("#reply_to_message_<%= @blogComment.id%>").replaceWith("<p id='reply_message_<%= @blogComment.id%>'></p>");
--- a/app/views/blog_comments/reply.js.erb
+++ b/app/views/blog_comments/reply.js.erb
@ -1,7 +1,7 @@
 <% if @in_user_center%>
    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_blog', :locals => {:activity => @article,:user_activity_id =>@user_activity_id}) %>");
-    init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+    init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", 'UserActivity');
 <% else%>
 $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'blogs/article', :locals => {:activity => @article,:user_activity_id =>@user_activity_id}) %>");
-init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", 'UserActivity');
 <% end %>
--- a/app/views/blog_comments/show.html.erb
+++ b/app/views/blog_comments/show.html.erb
@ -27,7 +27,7 @@
        }
    }
    $(function() {
-        init_activity_KindEditor_data(<%= @article.id%>,null,"85%");
+        init_activity_KindEditor_data(<%= @article.id%>,null,"85%", '<%=@article.class.to_s%>');
        showNormalImage('message_description_<%= @article.id %>');
    });
 </script>
--- a/app/views/blogs/_article_list.html.erb
+++ b/app/views/blogs/_article_list.html.erb
@ -74,7 +74,7 @@
              }

              $(function () {
-                  init_activity_KindEditor_data(<%= topic.id%>, null, "87%");
+                  init_activity_KindEditor_data(<%= topic.id%>, null, "87%", "<%=topic.class.to_s%>");
                  showNormalImage('activity_description_<%= topic.id %>');
                  /*var description_images=$("div#activity_description_<%#= topic.id %>").find("img");
                   if (description_images.length>0) {
--- a/app/views/boards/_course_new.html.erb
+++ b/app/views/boards/_course_new.html.erb
@ -1,5 +1,5 @@
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false) %>
+    <%= import_ke(enable_at: true, prettify: false) %>
 <% end %>

 <%= error_messages_for 'message' %>
@ -34,7 +34,9 @@
                           :class => 'talk_text fl',
                           :input_html => { :id => 'message_content',
                                            :class => 'talk_text fl',
-                                            :maxlength => 5000 }%>
+                                            :maxlength => 5000 },
+                           at_id: topic.id, at_type: topic.class.to_s
+          %>
          <div class="cl"></div>
          <p id="message_content_span"></p>
        </div>
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@ -1,5 +1,5 @@
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false) %>
+    <%= import_ke(enable_at: true, prettify: false) %>
    <%= javascript_include_tag "init_activity_KindEditor" %>
 <% end %>

@ -74,7 +74,7 @@
          }

          $(function () {
-              init_activity_KindEditor_data(<%= topic.id%>, null, "87%");
+              init_activity_KindEditor_data(<%= topic.id%>, null, "87%", "<%=topic.class.to_s%>");
              showNormalImage('activity_description_<%= topic.id %>');
              /*var description_images=$("div#activity_description_<%#= topic.id %>").find("img");
              if (description_images.length>0) {
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@ -20,7 +20,7 @@
  <% end %>
  <div class="cl"></div>
  <div class=" talklist_box" >
-    <div class="talk_new ml15 mb10" nhname="about_talk" style="display:none;">
+    <div class="talk_new ml15 mb10" nhname="about_talk" data-at-id="<%= project.id %>" data-at-type="Project" style="display:none;">
      <ul>
        <%= render :partial => 'project_new_topic' %>
      </ul>
@ -111,7 +111,7 @@
              <a href="javascript:void(0)" nhname="showbtn_reply" class="c_dblue fr f14" style="margin-right:10px;"><%= l(:button_reply) %></a>
            <% end %>
            <div class="cl"></div>
-            <div class="talk_new ml15 mb10" nhname='about_talk' id="about_newtalk<%=topic.id%>" style="display: none;border-top: 1px dashed #d9d9d9;padding-top:5px;margin-left:0px;padding-left:15px;">
+            <div class="talk_new ml15 mb10" nhname='about_talk' id="about_newtalk<%=topic.id%>" data-at-id="<%= topic.id %>" data-at-type="<%= topic.class.name %>" style="display: none;border-top: 1px dashed #d9d9d9;padding-top:5px;margin-left:0px;padding-left:15px;">
              <ul>
                <%= render :partial => 'edit',locals:  {:topic => topic} %>
              </ul>
@ -120,7 +120,7 @@
            <div class="talkWrapBox">
              <% reply = Message.new(:subject => "RE: #{topic.subject}")%>
              <% if !topic.locked? && authorize_for('messages', 'reply') %>
-                  <div class="talkWrapMsg" nhname="about_talk_reply" style="display: none;">
+                  <div class="talkWrapMsg" nhname="about_talk_reply" data-at-id="<%= topic.id %>" data-at-type="<%= topic.class.name %>" style="display: none;">
                    <em class="talkWrapArrow"></em>
                    <div class="cl"></div>
                    <div class="talkConIpt ml15 mb10" style="margin-left:30px;" id="reply<%= topic.id %>">
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@ -28,7 +28,7 @@
        window.attachEvent("onload", buildsubmenus)
 </script>
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false) %>
+    <%= import_ke(enable_at: true, prettify: false) %>
 <% end %>


@ -102,6 +102,10 @@ function nh_init_board(params){
                  if(/trident/.test(userAgent)){
                    $("div.talk_new .ke-container").css({'margin-left':'0px'});
                  }
+
+                  if(typeof enableAt === 'function'){
+                    enableAt(this,params.about_talk.attr('data-at-id'), params.about_talk.attr('data-at-type'));
+                  }
 //                    var toolbar = $("div[class='ke-toolbar']",params.about_talk);
 //                    $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
 //                    params.toolbar_container.append(toolbar);
--- a/app/views/comments/create.js.erb
+++ b/app/views/comments/create.js.erb
@ -3,4 +3,4 @@ $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(r
 <% else %>
 $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'projects/project_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
 <% end %>
-init_activity_KindEditor_data('<%= @user_activity_id%>',"","87%");
+init_activity_KindEditor_data('<%= @user_activity_id%>',"","87%", "UserActivity");
--- a/app/views/courses/_course_activity.html.erb
+++ b/app/views/courses/_course_activity.html.erb
@ -1,5 +1,5 @@
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+    <%= import_ke(enable_at: true, prettify: false, init_activity: true) %>
 <% end %>

 <style type="text/css">
@ -19,7 +19,7 @@
    }

    span.ke-toolbar-icon-url {
-        background-image: url(/images/public_icon.png)
+        background-image: url("/images/public_icon.png")
    }

    div.ke-toolbar .ke-outline {
@ -72,7 +72,7 @@
            }

            $(function () {
-                init_activity_KindEditor_data(<%= activity.id%>, null, "87%");
+                init_activity_KindEditor_data(<%= activity.id%>, null, "87%", "<%= activity.class.to_s %>");
                showNormalImage('activity_description_<%= activity.id %>');
                if($("#intro_content_<%= activity.id %>").height() > 360) {
                    $("#intro_content_show_<%= activity.id %>").show();
--- a/app/views/courses/_courses_jours.html.erb
+++ b/app/views/courses/_courses_jours.html.erb
@ -12,7 +12,9 @@
    div.recall_con .reply_btn{margin-left:525px;margin-top:5px;}
    /*.ke-container{height: 80px !important;}*/
 </style>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_KindEditor"  %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at:  true, prettify: false, init_activity: true) %>
+<% end %>
 <script >
    init_KindEditor_data('',80);
 </script>
--- a/app/views/courses/syllabus.html.erb
+++ b/app/views/courses/syllabus.html.erb
@ -1,6 +1,6 @@

 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+    <%= import_ke(enable_at:  true, prettify: false, init_activity: true) %>
    <%= javascript_include_tag 'blog' %>
 <% end %>

@ -40,7 +40,7 @@
        }
    }
    $(function() {
-        init_activity_KindEditor_data(<%= @article.id%>,null,"87%");
+        init_activity_KindEditor_data(<%= @article.id%>,null,"87%", "<%=@article.class.to_s%>");
        showNormalImage('message_description_<%= @article.id %>');
    });
 </script>
--- a/app/views/homework_common/start_anonymous_comment.js.erb
+++ b/app/views/homework_common/start_anonymous_comment.js.erb
@ -2,10 +2,10 @@
    alert('启动成功');
    <% if @user_activity_id == -1 %>
        $("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => "users/user_homework_detail",:locals => {:homework_common => @homework, :is_in_course => @is_in_course})%>");
-        init_activity_KindEditor_data(<%= @homework.id%>,"","87%");
+        init_activity_KindEditor_data(<%= @homework.id%>,"","87%", "<%=@homework.class.to_s%>");
    <% else %>
        $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@course_activity}) %>");
-        init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+        init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity");
    <% end %>
 /*$("#<%#= @homework.id %>_start_anonymous_comment").replaceWith('<%#= escape_javascript(link_to "关闭匿评", alert_anonymous_comment_homework_common_path(@homework), remote: true, id:"#{@homework.id}_stop_anonymous_comment",:class => "postOptionLink")%>');*/
 <% elsif @statue == 2 %>
--- a/app/views/homework_common/stop_anonymous_comment.js.erb
+++ b/app/views/homework_common/stop_anonymous_comment.js.erb
@ -1,10 +1,10 @@
 alert('关闭成功');
 <% if @user_activity_id == -1 %>
 $("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => "users/user_homework_detail",:locals => {:homework_common => @homework, :is_in_course => @is_in_course})%>");
-init_activity_KindEditor_data(<%= @homework.id%>,"","87%");
+init_activity_KindEditor_data(<%= @homework.id%>,"","87%", "<%=@homework.class.to_s%>");
 <% else %>
 $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@course_activity}) %>");
-init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", 'UserActivity');
 <% end %>
 /*
 $("#<%#= @homework.id %>_stop_anonymous_comment").replaceWith('');*/
--- a/app/views/issues/_edit.html.erb
+++ b/app/views/issues/_edit.html.erb
@ -1,9 +1,8 @@
 <div id="issue_edit" style="display: none">
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+    <%= import_ke(enable_at: true, prettify: false, init_activity: false) %>
 <% end %>

-
 <%= labelled_form_for @issue, :html => {:id => 'issue-form', :multipart => true,:remote=>true} do |f| %>
    <%= error_messages_for 'issue', 'time_entry' %>
    <%= render :partial => 'conflict' if @conflict %>
@ -21,9 +20,23 @@

    </div>
    <input name="issue_quote_new" type="hidden" value="<%= %>" />
+    <fieldset><legend>回复</legend>
+    <%= f.kindeditor :notes, :style => "width:99%;",:height=>'100px', :cssData =>"blockquote { padding:0px}", :rows => "5", :no_label => true, :editor_id=>'issue_journal_kind_reply', at_id: @issue.id, at_type: @issue.class.to_s %>
+    </fieldset>
+    <!--<%# if @issue.safe_attribute? 'private_notes' %>-->
+    <!--<label for="issue_private_notes"><%#= f.check_box :private_notes, :no_label => true %> <%#= l(:field_private_notes) %></label>-->
+    <!--<%# end %>-->
+
+    <%= call_hook(:view_issues_edit_notes_bottom, {:issue => @issue, :notes => @notes, :form => f}) %>
+    <!--</fieldset>-->
+
+    <!--<fieldset><legend><%#= l(:label_attachment_plural) %></legend>-->
+    <!--<p style="padding-top: 5px;"><%#= render :partial => 'attachments/new_form', :locals => {:container => @issue} %>
+    <!--</fieldset>-->
+
    <div class="cl"></div>
    <%= f.hidden_field :lock_version %>
    <%= hidden_field_tag 'last_journal_id', params[:last_journal_id] || @issue.last_journal_id %>
    <%= hidden_field_tag 'reference_user_id', params[:reference_user_id] %>
 <% end %>
-</div>
+</div>
--- a/app/views/issues/_form.html.erb
+++ b/app/views/issues/_form.html.erb
@ -49,7 +49,7 @@
              <%= f.label_for_field :description, :required => @issue.required_attribute?('description'), :no_label => true, :class => "label" %>
              <%#= link_to_function image_tag('edit.png'), '$(this).hide(); $("#issue_description_and_toolbar").show()' unless @issue.new_record? %>
              <%#= content_tag 'span', :id => "issue_description_and_toolbar" do %>
-              <%= f.kindeditor :description,:editor_id => "issue_desc_editor",  :width=>'85%', :resizeType => 0, :no_label => true %>
+              <%= f.kindeditor :description,:editor_id => "issue_desc_editor",  :width=>'87%', :resizeType => 0, :no_label => true,at_id: @project.id, at_type: @project.class.to_s %>
              <%# end %>
              <%#= wikitoolbar_for 'issue_description' %>
          <% end %>
@ -103,4 +103,4 @@
    <%= call_hook(:view_issues_form_details_bottom, {:issue => @issue, :form => f}) %>
 <% end %>
 <a href="javascript:void(0);" onclick="issue_desc_editor.sync();$('#issue-form').submit();" class="blue_btn fl ml80"> 确定</a>
-<a href="javascript:void(0);" onclick="issueDetailShow();" class="grey_btn fl mr50" > 取消 </a>
+<a href="javascript:void(0);" onclick="issueDetailShow();" class="grey_btn fl mr50" > 取消 </a>
--- a/app/views/issues/_issue_replies.html.erb
+++ b/app/views/issues/_issue_replies.html.erb
@ -17,7 +17,7 @@
            <% else %>
                <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
            <% end %>
-            <%= format_time(reply.created_on) %>
+            <%#= format_time(reply.created_on) %>
          </div>
          <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
            <% if reply.details.any? %>
--- a/app/views/issues/add_journal.js.erb
+++ b/app/views/issues/add_journal.js.erb
@ -4,6 +4,6 @@
    sd_create_editor_from_data(<%= @issue.id%>, null, "100%");
 <%else%>
    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id}) %>");
-   init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+   init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", 'UserActivity');
   // sd_create_editor_from_data(<%#= @issue.id%>, null, "100%");
-<%end %>
+<%end %>
--- a/app/views/issues/add_journal_in_org.js.erb
+++ b/app/views/issues/add_journal_in_org.js.erb
@ -1,3 +1,3 @@
 $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'organizations/org_project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id}) %>");

-init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity");
--- a/app/views/issues/new.html.erb
+++ b/app/views/issues/new.html.erb
@ -1,5 +1,5 @@
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+    <%= import_ke(enable_at: true, prettify: false, init_activity: false) %>
 <% end %>
 <script type="text/javascript">
    $(function(){
@ -20,10 +20,10 @@
        <div>
          <%= render :partial => 'issues/form', :locals => {:f => f} %>
        </div>
-        <!--<%= javascript_tag "$('#issue_subject').focus();" %>-->
-        <a href="#" class="blue_btn fl ml80" onclick="issue_desc_editor.sync();$('#issue-form').submit();">
-          <%= l(:button_create) %>
-        </a>
+        <!--<%#= javascript_tag "$('#issue_subject').focus();" %>-->
+        <!--<a href="#" class="blue_btn fl ml80" onclick="issue_desc_editor.sync();$('#issue-form').submit();">-->
+          <!--<%#= l(:button_create) %>-->
+        <!--</a>-->
        <%#= preview_link preview_new_issue_path(:project_id => @project), 'issue-form', 'preview', {:class => "blue_btn fl ml10"} %>
    <% end %>
    <div id="preview" class="wiki"></div>
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@ -34,7 +34,7 @@
        }
    }
    $(function() {
-        init_activity_KindEditor_data(<%= @memo.id%>,null,"87%");
+        init_activity_KindEditor_data(<%= @memo.id%>,null,"87%", "<%=@memo.class.to_s%>");
    });

    function del_confirm(){
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@ -27,7 +27,7 @@
        }
    }
    $(function() {
-        init_activity_KindEditor_data(<%= @topic.id%>,null,"85%");
+        init_activity_KindEditor_data(<%= @topic.id%>,null,"85%", "<%=@topic.class.to_s%>");
        showNormalImage('message_description_<%= @topic.id %>');
    });
 </script>
--- a/app/views/messages/quote.js.erb
+++ b/app/views/messages/quote.js.erb
@ -11,7 +11,7 @@ if($("#reply_message_<%= @message.id%>").length > 0) {
    $(function(){
        $('#reply_subject').val("<%= raw escape_javascript(@subject) %>");
        $('#quote_quote').val("<%= raw escape_javascript(@temp.content.html_safe) %>");
-        init_activity_KindEditor_data(<%= @message.id%>,null,"85%");
+        init_activity_KindEditor_data(<%= @message.id%>,null,"85%", "<%=@message.class.to_s%>");
    });
 }else if($("#reply_to_message_<%= @message.id%>").length >0) {
    $("#reply_to_message_<%= @message.id%>").replaceWith("<p id='reply_message_<%= @message.id%>'></p>");
--- a/app/views/messages/reply.js.erb
+++ b/app/views/messages/reply.js.erb
@ -3,4 +3,4 @@
 <%elsif @course%>
    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>");
 <%end%>
-init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity");
--- a/app/views/org_document_comments/_reply_form.html.erb
+++ b/app/views/org_document_comments/_reply_form.html.erb
@ -1,2 +1,2 @@
 $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_blog', :locals => {:activity => @article,:user_activity_id =>@user_activity_id}) %>");
-init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity");
--- a/app/views/org_document_comments/add_reply.js.erb
+++ b/app/views/org_document_comments/add_reply.js.erb
@ -1,3 +1,2 @@
-
 $("#organization_document_<%= @act.id %>").replaceWith("<%= escape_javascript(render :partial => 'organizations/show_org_document', :locals => {:document => @document,:flag => params[:flag], :act => @act}) %>");
-init_activity_KindEditor_data(<%= @act.id %>,"","87%");
+init_activity_KindEditor_data(<%= @act.id %>,"","87%", "<%=@act.class.to_s%>");
--- a/app/views/org_document_comments/index.html.erb
+++ b/app/views/org_document_comments/index.html.erb
@ -19,7 +19,7 @@
    <% @documents.each do |document| %>
        <script>
            $(function() {
-                init_activity_KindEditor_data(<%= OrgActivity.where("org_act_type='OrgDocumentComment'and org_act_id=?", document.id).first.id %>, null, "87%");
+                init_activity_KindEditor_data(<%= OrgActivity.where("org_act_type='OrgDocumentComment'and org_act_id=?", document.id).first.id %>, null, "87%", "OrgActivity");
            });
        </script>
          <%= render :partial => 'organizations/show_org_document', :locals => {:document => document, :act => OrgActivity.where("org_act_type='OrgDocumentComment'and org_act_id=?", document.id).first, :flag => 0} %>
--- a/app/views/org_document_comments/quote.js.erb
+++ b/app/views/org_document_comments/quote.js.erb
@ -3,7 +3,7 @@ if($("#reply_message_<%= @org_comment.id%>").length > 0) {
    $(function(){
        $('#reply_subject').val("<%= raw escape_javascript(@subject) %>");
        $('#quote_quote').val("<%= raw escape_javascript(@temp.content.html_safe) %>");
-        init_activity_KindEditor_data(<%= @org_comment.id%>,null,"85%");
+        init_activity_KindEditor_data(<%= @org_comment.id%>,null,"85%", "<%=@org_comment.class.to_s%>");
    });
 }else if($("#reply_to_message_<%= @org_comment.id %>").length >0) {
    $("#reply_to_message_<%= @org_comment.id%>").replaceWith("<p id='reply_message_<%= @org_comment.id %>'></p>");
--- a/app/views/org_document_comments/show.html.erb
+++ b/app/views/org_document_comments/show.html.erb
@ -1,7 +1,7 @@
 <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor",'blog' %>
 <script>
    $(function() {
-        init_activity_KindEditor_data(<%= @document.id%>,null,"85%");
+        init_activity_KindEditor_data(<%= @document.id%>,null,"85%", "<%=@document.class.to_s%>");
        showNormalImage('message_description_<%= @document.id %>');
    });
 </script>
--- a/app/views/organizations/_org_activities.html.erb
+++ b/app/views/organizations/_org_activities.html.erb
@ -2,7 +2,7 @@
    <% org_activities.each do |act| %>
        <script>
            $(function() {
-                init_activity_KindEditor_data(<%= act.id%>, null, "87%");
+                init_activity_KindEditor_data(<%= act.id%>, null, "87%", "<%=act.class.to_s%>");
            });
        </script>
        <% if act.container_type == 'Organization' %>
--- a/app/views/organizations/show.html.erb
+++ b/app/views/organizations/show.html.erb
@ -61,7 +61,7 @@
 <% if !@organization.home_id.nil? and OrgDocumentComment.where("id = ?", @organization.home_id).count > 0 and params[:org_subfield_id].nil? %>
    <script>
        $(function() {
-            init_activity_KindEditor_data(<%= OrgActivity.where("org_act_type = 'OrgDocumentComment' and org_act_id =?",@organization.home_id).first.id %>, null, "87%");
+            init_activity_KindEditor_data(<%= OrgActivity.where("org_act_type = 'OrgDocumentComment' and org_act_id =?",@organization.home_id).first.id %>, null, "87%", 'OrgActivity');
        });
    </script>
    <% act = OrgActivity.where("org_act_type = 'OrgDocumentComment' and org_act_id =?", @organization.home_id).first %>
--- a/app/views/projects/_project_activities.html.erb
+++ b/app/views/projects/_project_activities.html.erb
@ -1,4 +1,4 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor", '/assets/kindeditor/pasteimg', "init_activity_KindEditor" %>
+<%= import_ke(enable_at: true, prettify: false, init_activity: true) %>
 <style type="text/css">
    /*回复框*/
    div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
@ -32,7 +32,7 @@
            }

            $(function () {
-                init_activity_KindEditor_data(<%= activity.id%>, null, "87%");
+                init_activity_KindEditor_data(<%= activity.id%>, null, "87%", "<%= activity.class.to_s %>");
                showNormalImage('activity_description_<%= activity.id %>');
                if ($("#intro_content_<%= activity.id %>").height() > 360) {
                    $("#intro_content_show_<%= activity.id %>").show();
--- a/app/views/student_work/forbidden_anonymous_comment.js.erb
+++ b/app/views/student_work/forbidden_anonymous_comment.js.erb
@ -1,7 +1,7 @@
 <% if @user_activity_id == -1 %>
 $("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => "users/user_homework_detail",:locals => {:homework_common => @homework, :is_in_course => @is_in_course})%>");
-init_activity_KindEditor_data(<%= @homework.id%>,"","87%");
+init_activity_KindEditor_data(<%= @homework.id%>,"","87%", "<%=@homework.class.to_s%>");
 <% else %>
 $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@course_activity}) %>");
-init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity");
 <% end %>
--- a/app/views/student_work/set_score_rule.js.erb
+++ b/app/views/student_work/set_score_rule.js.erb
@ -1,8 +1,8 @@
 clickCanel();
 <% if @user_activity_id %>
    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@courae_activity}) %>");
-    init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+    init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity");
 <% else %>
    $("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => 'users/user_homework_detail', :locals => {:homework_common => @homework,:is_in_course => @is_in_course}) %>");
-    init_activity_KindEditor_data(<%= @homework.id%>,"","87%");
-<% end %>
+    init_activity_KindEditor_data(<%= @homework.id%>,"","87%", "<%=@homework.class.to_s%>");
+<% end %>
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@ -1,12 +1,12 @@
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+    <%= import_ke(enable_at: true, prettify: false, init_activity: true) %>
 <% end %>

 <style type="text/css">
    /*回复框*/
    div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
    span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
-    span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
+    span.ke-toolbar-icon-url{background-image:url( "/images/public_icon.png" )}
    div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
    span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
    span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
@ -39,7 +39,7 @@
            }

            $(function() {
-                init_activity_KindEditor_data(<%= user_activity.id%>, null, "87%");
+                init_activity_KindEditor_data(<%= user_activity.id%>, null, "87%", "<%=user_activity.class.to_s%>");
                showNormalImage('activity_description_<%= user_activity.id %>');
                if($("#intro_content_<%= user_activity.id %>").height() > 360) {
                    $("#intro_content_show_<%= user_activity.id %>").show();
--- a/app/views/users/_user_at_message.html.erb
+++ b/app/views/users/_user_at_message.html.erb
@ -0,0 +1,21 @@
+<% if AtMessage === ma && ma.at_valid? %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.author), :width => "30", :height => "30"),user_path(ma.author) %></a></li>
+          <li class="homepageNewsPubType fl">
+            <span class="newsBlue homepageNewsPublisher"><%= ma.author.login %></span><span class="homepageNewsType fl">提到了你：</span>
+          </li>
+          <li class="homepageNewsContent fl">
+            <%= link_to ma.subject.html_safe, ma.url,
+                        :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}",
+                        :onmouseover =>"message_titile_show($(this),event)",
+                        :onmouseout => "message_titile_hide($(this))" %></li>
+          <div  style="display: none" class="message_title_red system_message_style">
+            <p><strong>标题：</strong><%= ma.subject %></p>
+            <% unless ma.description.nil? %>
+                <div class="fl"><strong>内容：</strong></div>
+                <div class="ml36"><%= ma.description.html_safe %></div>
+            <% end %>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+<% end %>
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@ -1,5 +1,5 @@
 <% content_for :header_tags do %>
-        <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+    <%= import_ke(enable_at: true, prettify: false, init_activity: false) %>

    <%= javascript_include_tag 'homework','baiduTemplate' %>
    <script type="text/javascript">
@ -42,10 +42,10 @@
  <div id="homework_editor" style="display: <%= edit_mode ? 'block':'none'%>">
    <div class="mt10">
      <% if edit_mode %>
-          <%= f.kindeditor :description, :editor_id => 'homework_description_editor', :height => "150px", :owner_id => homework.id, :owner_type => OwnerTypeHelper::HOMEWORKCOMMON %>
+          <%= f.kindeditor :description, :editor_id => 'homework_description_editor', :height => "150px", :owner_id => homework.id, :owner_type => OwnerTypeHelper::HOMEWORKCOMMON, at_id: homework.id, at_type: homework.class.to_s %>
      <% else %>
          <%= hidden_field_tag :asset_id, params[:asset_id], :required => false, :style => 'display:none' %>
-          <%= f.kindeditor :description, :editor_id => 'homework_description_editor', :height => "150px" %>
+          <%= f.kindeditor :description, :editor_id => 'homework_description_editor', :height => "150px",at_id: homework.id, at_type: homework.class.to_s  %>
      <% end %>
    </div>
    <div class="cl"></div>
--- a/app/views/users/_user_homework_list.html.erb
+++ b/app/views/users/_user_homework_list.html.erb
@ -1,12 +1,12 @@
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+    <%= import_ke(enable_at: true, prettify: false, init_activity: true) %>
 <% end %>

 <style type="text/css">
    /*回复框*/
    .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
    .homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}
-    .homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}
+    .homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url("/images/public_icon.png")}
    .homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}
    .homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}
    .homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}
@ -17,7 +17,7 @@
 <% homework_commons.each do |homework_common|%>
    <script type="text/javascript">
        $(function() {
-            init_activity_KindEditor_data(<%= homework_common.id%>, null, "87%");
+            init_activity_KindEditor_data(<%= homework_common.id%>, null, "87%", "<%=homework_common.class.to_s%>");
            showNormalImage('homework_description_<%= homework_common.id%>');
            if($("#intro_content_<%= homework_common.id%>").height() > 360) {
                $("#intro_content_show_<%= homework_common.id%>").show();
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@ -17,6 +17,8 @@
                <%# 系统消息 %>
                <%= render :partial => 'users/user_message_system', :locals => {:ma => ma}  %>

+                <%= render :partial => 'users/user_at_message', :locals => {:ma => ma}  %>
+
                <%# 课程消息 %>
                <%= render :partial => 'users/user_message_course', :locals => {:ma => ma}  %>

--- a/app/views/words/create_reply.js.erb
+++ b/app/views/words/create_reply.js.erb
@ -5,7 +5,7 @@
        <% else %>
            $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id}) %>");
        <% end %>
-        init_activity_KindEditor_data('<%= @user_activity_id%>', "", "87%");
+        init_activity_KindEditor_data('<%= @user_activity_id%>', "", "87%", "UserActivity");
    <% else %>
        <% if !@jfm.nil? && @jfm.jour_type == 'Principal' %>
            $("#<%= @jfm.m_parent_id%>").children("div[nhname='reply_list']").prepend("<%= escape_javascript( render(:partial => 'users/user_jour_reply',:locals => {:reply=>@jfm} )) %>");
--- a/app/views/words/leave_homework_message.js.erb
+++ b/app/views/words/leave_homework_message.js.erb
@ -1,7 +1,7 @@
 <% if @user_activity_id %>
    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework_common,:user_activity_id =>@user_activity_id,:course_activity => @course_activity}) %>");
-    init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+    init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity");
 <% elsif @homework_common_id && @is_in_course %>
    $("#homework_common_<%= @homework_common_id %>").replaceWith("<%= escape_javascript(render :partial => 'users/user_homework_detail', :locals => {:homework_common => @homework_common,:is_in_course => @is_in_course}) %>");
-    init_activity_KindEditor_data(<%= @homework_common_id%>,"","87%");
+    init_activity_KindEditor_data(<%= @homework_common_id%>,"","87%", "HomeworkCommon");
 <% end %>
--- a/config/routes.rb
+++ b/config/routes.rb
@ -1063,13 +1063,14 @@ RedmineApp::Application.routes.draw do
  match 'system_log/clear'
  ##ended by lizanle

-
  resources :git_callback do
    collection do
      post 'post_update'
    end
  end

+  resources :at
+
  Dir.glob File.expand_path("plugins/*", Rails.root) do |plugin_dir|
    file = File.join(plugin_dir, "config/routes.rb")
    if File.exists?(file)
--- a/db/migrate/20151216025539_create_at_messages.rb
+++ b/db/migrate/20151216025539_create_at_messages.rb
@ -0,0 +1,15 @@
+class CreateAtMessages < ActiveRecord::Migration
+  def change
+    create_table :at_messages do |t|
+      t.references :user
+      t.integer :at_message_id
+      t.string :at_message_type
+      t.boolean :viewed, :default => false
+      t.string :container_type
+      t.integer :container_id
+
+      t.timestamps
+    end
+    add_index :at_messages, :user_id
+  end
+end
--- a/db/migrate/20151216030610_add_sender_to_at_message.rb
+++ b/db/migrate/20151216030610_add_sender_to_at_message.rb
@ -0,0 +1,5 @@
+class AddSenderToAtMessage < ActiveRecord::Migration
+  def change
+    add_column :at_messages, :sender_id, :integer
+  end
+end
--- a/db/schema.rb
+++ b/db/schema.rb
@ -66,6 +66,20 @@ ActiveRecord::Schema.define(:version => 20151217051447) do
    t.datetime "updated_at", :null => false
  end

+  create_table "at_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "at_message_id"
+    t.string   "at_message_type"
+    t.boolean  "viewed"
+    t.string   "container_type"
+    t.integer  "container_id"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+    t.integer  "sender_id"
+  end
+
+  add_index "at_messages", ["user_id"], :name => "index_at_messages_on_user_id"
+
  create_table "attachments", :force => true do |t|
    t.integer  "container_id"
    t.string   "container_type", :limit => 30
--- a/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb
+++ b/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb
@ -1,29 +1,36 @@
 module RailsKindeditor
  module Helper
-    EVAL_STR = %Q|eval(function(){ if(typeof enablePasteImg ==='function'){enablePasteImg(self);} if(typeof enableAt ==='function'){enableAt(self);} this.loadPlugin("autoheight")})|
+
+    def eval_str(at_id, at_type)
+      %Q|eval(function(){ if(typeof enablePasteImg ==='function'){enablePasteImg(self);};if(typeof enableAt ==='function'){enableAt(self, #{at_id}, '#{at_type}');}; this.loadPlugin('autoheight')})|
+    end

    def kindeditor_tag(name, content = nil, options = {})
      id = sanitize_to_id(name)
+      at_id = options[:at_id] || 0
+      at_type = options[:at_type] || ''
      input_html = { :id => id }.merge(options.delete(:input_html) || {})
      input_html = input_html.merge(style: 'display:none')
      output = ActiveSupport::SafeBuffer.new
      output << text_area_tag(name, content, input_html)
      output << javascript_tag(js_replace(id, options.merge(window_onload: 'true',
                                                            :autoHeightMode=>true,
-                                                            afterCreate: EVAL_STR,
+                                                            afterCreate: eval_str(at_id, at_type),
                                                            emotionsBasePath: 'http://' + Setting.host_name
                                                            )))
    end
    
    def kindeditor(name, method, options = {})
      # TODO: Refactory options: 1. kindeditor_option 2. html_option
+      at_id = options[:at_id] || 0
+      at_type = options[:at_type] || ''
      input_html = (options.delete(:input_html) || {}).stringify_keys
      input_html = input_html.merge(style: 'display:none')
      output_buffer = ActiveSupport::SafeBuffer.new
      output_buffer << build_text_area_tag(name, method, self, options, input_html)
      output_buffer << javascript_tag(js_replace(input_html['id'],options.merge(window_onload: 'true',
                                                                                 :autoHeightMode=>true,
-                                                                                afterCreate: EVAL_STR,
+                                                                                afterCreate: eval_str(at_id, at_type),
                                                                                emotionsBasePath: 'http://' + Setting.host_name
                                                                                )))
    end
--- a/public/assets/kindeditor/at/config.js
+++ b/public/assets/kindeditor/at/config.js
@ -1,9 +1,12 @@
-function enableAt(_editor) {
+var enableAt = function(_editor) {
    var editor = _editor;
    if(editor.edit == undefined || editor.edit.iframe == undefined){
        return;
    }

+    var id = arguments[1] ? arguments[1] : undefined;
+    var type = arguments[2] ? arguments[2] : 'Activity';
+
    var ifr = editor.edit.iframe[0];
    var doc = ifr.contentDocument || iframe.contentWindow.document;
    var ifrBody = doc.body;
@ -11,10 +14,16 @@ function enableAt(_editor) {
    console.log("enable at");

    $.fn.atwho.debug = true;
-    if(!atPersonLists){
-        return;
+
+
+    var names = [];
+    if("undefined" !== (typeof atPersonLists)){
+        names = atPersonLists;
+    }
+
+    if('undefined' != (typeof id)){
+        names = '/at/' + id + '?type='+type;
    }
-    var names = atPersonLists;

    //var names = ["Jacob","Isabella","Ethan","Emma","Michael","Olivia","Alexander","Sophia","William","Ava","Joshua","Emily","Daniel","Madison","Jayden","Abigail","Noah","Chloe","你好","你你你", "가"];
    //
@ -25,14 +34,13 @@ function enableAt(_editor) {
    var at_config = {
        at: "@",
        data: names,
-        insertTpl: '<span style="color:#269ac9">@${name}(${login})</span>',
+        insertTpl: '<span class="at" data-user-id="${userid}">@${name}(${login})</span>',
        displayTpl: "<li>${name} <small>${login}</small></li>",
        searchKey: 'searchKey',
        limit: 200
-    }
+    };

    $inputor = $(ifrBody).atwho(at_config);
-    window.aaa= $inputor;
    $inputor.caret('pos', 47);
    $inputor.focus().atwho('run');
 };
--- a/public/assets/kindeditor/at/jquery.atwho.css
+++ b/public/assets/kindeditor/at/jquery.atwho.css
@ -16,7 +16,7 @@
 }

 .atwho-view .cur {
-    background: #3366FF;
+    background: #269ac9;
    color: white;
 }
 .atwho-view .cur small {
@ -47,3 +47,6 @@
    color: #777;
    font-weight: normal;
 }
+
+/* @功能 定义 */
+span.at {color:#269ac9;}
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@ -282,7 +282,7 @@ K.options = {
 		font : ['id', 'class', 'color', 'size', 'face', '.background-color'],
 		span : [
 			'id', 'class', '.color', '.background-color', '.font-size', '.font-family', '.background',
-			'.font-weight', '.font-style', '.text-decoration', '.vertical-align', '.line-height'
+			'.font-weight', '.font-style', '.text-decoration', '.vertical-align', '.line-height', 'data-user-id'
 		],
 		div : [
 			'id', 'class', 'align', '.border', '.margin', '.padding', '.text-align', '.color',
--- a/public/assets/kindeditor/plugins/code/previewcode.css
+++ b/public/assets/kindeditor/plugins/code/previewcode.css
@ -44,4 +44,5 @@
 .ke-content div.ref .ref_body {margin:0;padding:2px;line-height:20px;color:#666;font-size:9pt;}


-.ke-content blockquote {margin:15px 10px;border:2px solid #eee;padding:5px 5px 5px 35px;background:#f4f5f7 url('../img/blockquote.gif') no-repeat left top;color:#060;font-size:9pt;}
+.ke-content blockquote {margin:15px 10px;border:2px solid #eee;padding:5px 5px 5px 35px;background:#f4f5f7 url('../img/blockquote.gif') no-repeat left top;color:#060;font-size:9pt;}
+span.at {color:#269ac9;}
--- a/public/javascripts/init_activity_KindEditor.js
+++ b/public/javascripts/init_activity_KindEditor.js
@ -2,6 +2,7 @@ function init_editor(params){
    // var minHeight;  //最小高度
    var paramsHeight = params.height; //设定的高度
    var id = arguments[1] ? arguments[1] : undefined;
+    var type = arguments[2] ? arguments[2] : undefined;
    var paramsWidth = params.width == undefined ? "100%" : params.width;

    var editor = params.kindutil.create(params.textarea, {
@ -64,7 +65,10 @@ function init_editor(params){
            edit.html("<span id='hint' style='color: #999999; font-size: 12px'>我要回复</span>");
            this.resize(null,Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight)+ paramsHeight , paramsHeight));// Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight)+ paramsHeight , paramsHeight)
            // params.toolbar_container.hide();
-
+            console.log("afterCreate");
+            if(typeof enableAt === 'function'){
+                enableAt(this,id, type);
+            }
        }
    }).loadPlugin('paste');
    return editor;
@ -126,6 +130,7 @@ function nh_reset_form(params){
 function init_activity_KindEditor_data(id){
    var height = arguments[1] ? arguments[1] : undefined;
    var width = arguments[2] ? arguments[2] : undefined;
+    var type = arguments[3] ? arguments[3] : '';
    KindEditor.ready(function (K) {
        $("div[nhname='new_message_" + id + "']").each(function () {
            var params = {};
@ -143,7 +148,7 @@ function init_activity_KindEditor_data(id){
            params.height = height;
            params.width = width;
            if (params.textarea.data('init') == undefined) {
-                params.editor = init_editor(params,id);
+                params.editor = init_editor(params,id, type);
                init_form(params);
                params.cancel_btn.click(function () {
                    nh_reset_form(params);
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@ -1381,5 +1381,8 @@ a:hover.blueCir{ background:#3598db; color:#fff;}
 .proHelp {background:url(/images/course/hwork_icon.png) -5px -124px no-repeat; display:inline-block; width:15px; height:15px; display:inline-block;}
 .hworkPrName {width:110px; max-width:110px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:18px; line-height:18px; font-size:12px; color:#888888; text-align:center;}
 .mr150 {margin-right:150px;}
+/* @功能 定义 */
+span.at {color:#269ac9;}
+=======
 .relatePInfo {position:absolute; background-color:#ffffff; padding:3px 8px; white-space:nowrap; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); z-index:999; color:#585858; cursor:pointer; display:none;}

--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@ -915,3 +915,5 @@ a.resourcesTypeUser {background:url(images/homepage_icon.png) -178px -453px no-r
 .list_style ol li{list-style-type: decimal;margin-left: 20px;}
 .list_style ul li{list-style-type: disc;margin-left: 20px;}

+/* @功能 定义 */
+span.at {color:#269ac9;}
--- a/spec/factories/at_messages.rb
+++ b/spec/factories/at_messages.rb
@ -0,0 +1,12 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :at_message do
+    user nil
+    at_message_id 1
+    at_message_type "MyString"
+    viewed false
+    container_type "MyString"
+    container_id 1
+  end
+end
--- a/spec/models/at_message_spec.rb
+++ b/spec/models/at_message_spec.rb
@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe AtMessage, :type => :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end