From 71a55040170dc7e4023425b41e657353edb536c0 Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Mon, 7 Dec 2015 15:05:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4at=E5=8A=9F=E8=83=BD,?= =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/issues_controller.rb | 1 + public/assets/kindeditor/at/config.js | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index c65dcf598..7cdc838e2 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -147,6 +147,7 @@ class IssuesController < ApplicationController #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 { diff --git a/public/assets/kindeditor/at/config.js b/public/assets/kindeditor/at/config.js index 44947828f..b9769c42e 100644 --- a/public/assets/kindeditor/at/config.js +++ b/public/assets/kindeditor/at/config.js @@ -8,11 +8,9 @@ function enableAt(_editor) { var doc = ifr.contentDocument || iframe.contentWindow.document; var ifrBody = doc.body; ifrBody.contentEditable = true; - console.log("enable at"); $.fn.atwho.debug = true; - if(!atPersonLists){ return; }