From da5709e3f04799b659ffad25d207c33894dc773c Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 15 Dec 2015 14:52:24 +0800
Subject: [PATCH] .

---
 app/views/at/show.json.erb            | 2 +-
 public/assets/kindeditor/at/config.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/at/show.json.erb b/app/views/at/show.json.erb
index 7af729ff7..5341f251e 100644
--- a/app/views/at/show.json.erb
+++ b/app/views/at/show.json.erb
@@ -1,6 +1,6 @@
 [
   <% @users && @users.each_with_index do |person,index| %>
-  {"id": <%=index%>, "name": "<%=person.show_name%>", "login": "<%=person.login%>", "searchKey": "<%=person.get_at_show_name%>"}
+  {"id":<%=index%>, "userid": <%=person.id%>, "name": "<%=person.show_name%>", "login": "<%=person.login%>", "searchKey": "<%=person.get_at_show_name%>"}
   <%= index != @users.size-1 ? ',' : '' %>
   <% end %>
 ]
diff --git a/public/assets/kindeditor/at/config.js b/public/assets/kindeditor/at/config.js
index 08b8fad5d..669e63074 100644
--- a/public/assets/kindeditor/at/config.js
+++ b/public/assets/kindeditor/at/config.js
@@ -34,7 +34,7 @@ var enableAt = function(_editor) {
     var at_config = {
         at: "@",
         data: names,
-        insertTpl: '<span style="color:#269ac9">@${name}(${login})</span>',
+        insertTpl: '@${name}(${login})',
         displayTpl: "<li>${name} <small>${login}</small></li>",
         searchKey: 'searchKey',
         limit: 200