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

Merge branch 'szzh' into develop

This commit is contained in:
sw 2015-09-25 17:51:06 +08:00
parent 16869ea42c 4a5dfe1109
commit 715ec0bed8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/journal_reply.rb
View File

@ -16,7 +16,7 @@ class JournalReply < ActiveRecord::Base
replier = User.find(self.reply_id) replier = User.find(self.reply_id)
receivers = [] 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 receivers << replier
end end
if journal.user_id != journal.issue.author_id && self.reply_id != journal.issue.author_id if journal.user_id != journal.issue.author_id && self.reply_id != journal.issue.author_id

4
app/views/memos/edit.html.erb
View File

@ -28,14 +28,14 @@
</div> </div>
<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> <script>
var ta = document.getElementById('memo_subject') var ta = document.getElementById('memo_subject')
autoTextarea(ta) autoTextarea(ta)
</script> </script>
</div> </div>
<div class="mt15"> <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> <script>
var ta1 = document.getElementById('memo_content') var ta1 = document.getElementById('memo_content')
autoTextarea(ta1) autoTextarea(ta1)