From 4845435aa310da1251abf87ed9cc1e047e022840 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 25 Sep 2015 17:38:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B8=96=E5=AD=90=E7=9A=84=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/memos/edit.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/memos/edit.html.erb b/app/views/memos/edit.html.erb
index 4a515ee1f..310cdb6ad 100644
--- a/app/views/memos/edit.html.erb
+++ b/app/views/memos/edit.html.erb
@@ -28,14 +28,14 @@
 
       </div>
   <div>
-    <textarea type="text" id="memo_subject" name="memo[subject]" class="postDetailInput" placeholder="对应帖子标题"  ><%= @memo.subject%></textarea>
+    <textarea type="text" id="memo_subject" name="memo[subject]" maxlength="50" class="postDetailInput" placeholder="对应帖子标题"  ><%= @memo.subject%></textarea>
     <script>
       var ta = document.getElementById('memo_subject')
       autoTextarea(ta)
     </script>
   </div>
   <div class="mt15">
-    <textarea type="text" id="memo_content" name="memo[content]" class="postDetailInput" placeholder="对应帖子内容" ><%= @memo.content.html_safe%></textarea>
+    <textarea type="text" id="memo_content" name="memo[content]" maxlength="5000" class="postDetailInput" placeholder="对应帖子内容" ><%= @memo.content.html_safe%></textarea>
     <script>
         var ta1 = document.getElementById('memo_content')
         autoTextarea(ta1)

From 8c841796503704c74799226355b95ee7bb04632f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 25 Sep 2015 17:52:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9issue=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=87=8D=E5=A4=8D=E6=8F=90=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/journal_reply.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/journal_reply.rb b/app/models/journal_reply.rb
index a1ea761af..16055608a 100644
--- a/app/models/journal_reply.rb
+++ b/app/models/journal_reply.rb
@@ -16,7 +16,7 @@ class JournalReply < ActiveRecord::Base
     replier = User.find(self.reply_id)
     receivers = []
     # 被回复的人发送消息
-    if journal.user_id != self.reply_id && self.reply_id != journal.issue.author_id
+    if journal.user_id != self.reply_id && self.reply_id != journal.issue.author_id && self.reply_id != journal.issue.assigned_to_id
       receivers << replier
     end
     if journal.user_id != journal.issue.author_id && self.reply_id != journal.issue.author_id