From 1a2aff99beace6b54bf3ea24802e7e5c38d2f97f Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Mon, 7 Dec 2015 14:18:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=98=BE=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/issues_controller.rb  | 5 ++---
 app/helpers/application_helper.rb     | 2 +-
 public/assets/kindeditor/at/config.js | 5 +++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 407c7a3bd..c65dcf598 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -145,9 +145,8 @@ class IssuesController < ApplicationController
     #id name email
     #1. issues list persons
     #2. project persons
-    @at_persons = []
-    @journals.each {|j| @at_persons << j.user unless @at_persons.include?(j.user)}
-    @issue.project.users.each {|u| @at_persons << u unless @at_persons.include?(u)}
+    @at_persons = @journals.map(&:user) + @issue.project.users
+    @at_persons = @at_persons.uniq{|u| u.id}.delete_if{|u| u.id == User.current.id}
 
     respond_to do |format|``
     format.html {
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 1d1fe3164..ba8fe4f53 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2628,7 +2628,7 @@ int main(int argc, char** argv){
       ss += 'window.atPersonLists = [];'
 
       @at_persons && @at_persons.each_with_index do |person,index|
-        ss += "var o = {id: #{index}, name: '#{person.get_at_show_name}', email: '#{person.mail}'};"
+        ss += "var o = {id: #{index}, name: '#{person.show_name}', login: '#{person.login}', searchKey: '#{person.get_at_show_name}'};"
         ss += "atPersonLists.push(o);"
       end
 
diff --git a/public/assets/kindeditor/at/config.js b/public/assets/kindeditor/at/config.js
index 8ca9b117f..44947828f 100644
--- a/public/assets/kindeditor/at/config.js
+++ b/public/assets/kindeditor/at/config.js
@@ -27,8 +27,9 @@ function enableAt(_editor) {
     var at_config = {
         at: "@",
         data: names,
-        insertTpl: '@${name}',
-        displayTpl: "<li>${name} <small>${email}</small></li>",
+        insertTpl: '<span style="color:#269ac9">@${name}(${login})</span>',
+        displayTpl: "<li>${name} <small>${login}</small></li>",
+        searchKey: 'searchKey',
         limit: 200
     }