jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

去除at功能,合并

This commit is contained in:
guange 2015-12-07 15:05:51 +08:00
parent 1a2aff99be
commit 71a5504017
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/issues_controller.rb
View File

@ -147,6 +147,7 @@ class IssuesController < ApplicationController
#2. project persons #2. project persons
@at_persons = @journals.map(&:user) + @issue.project.users @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 = @at_persons.uniq{|u| u.id}.delete_if{|u| u.id == User.current.id}
@at_persons = nil
respond_to do |format|`` respond_to do |format|``
format.html { format.html {

2
public/assets/kindeditor/at/config.js
View File

@ -8,11 +8,9 @@ function enableAt(_editor) {
var doc = ifr.contentDocument || iframe.contentWindow.document; var doc = ifr.contentDocument || iframe.contentWindow.document;
var ifrBody = doc.body; var ifrBody = doc.body;
ifrBody.contentEditable = true; ifrBody.contentEditable = true;
console.log("enable at"); console.log("enable at");
$.fn.atwho.debug = true; $.fn.atwho.debug = true;
if(!atPersonLists){ if(!atPersonLists){
return; return;
} }