Merge branch 'szzh' into develop

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

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)