From b9e989225734bd2c85adfe440baaabca7e9b11fe Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Tue, 30 Aug 2016 15:01:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1issue=E6=8C=87=E5=90=91BUG?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8Cissue@=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/issues_controller.rb | 2 +-
 app/models/at_message.rb             | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 8880a4f3e..f108c685a 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -592,7 +592,7 @@ class IssuesController < ApplicationController
 
     senduser = User.find(params[:issue][:assigned_to_id])
 
-    if senduser.id != User.current.id && @issue.assigned_to_id != params[:issue][:assigned_to_id]
+    if senduser.id != User.current.id && @issue.assigned_to_id != params[:issue][:assigned_to_id].to_i
       issue_id = @issue.id
       issue_title = params[:issue][:subject]
       priority_id = params[:issue][:priority_id]
diff --git a/app/models/at_message.rb b/app/models/at_message.rb
index 302211911..1c0c88d89 100644
--- a/app/models/at_message.rb
+++ b/app/models/at_message.rb
@@ -47,6 +47,8 @@ class AtMessage < ActiveRecord::Base
       detail_content = strip_html at_message.notes,30
     elsif defined? at_message.content
       detail_content = strip_html at_message.content,30
+    elsif defined? at_message.description
+      detail_content = strip_html at_message.description,30
     end
 
     user = self.user