From 5f87d5806b360de807b06cfdfeb1cd727cb2e6d8 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 11 Aug 2015 15:26:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=95=99=E8=A8=80=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E6=8F=90=E7=A4=BA=E4=B8=AD=E9=81=97=E7=95=99=E7=9A=84?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/journal.rb | 2 +- app/models/user.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/journal.rb b/app/models/journal.rb index 3b660132e..14eecc9cd 100644 --- a/app/models/journal.rb +++ b/app/models/journal.rb @@ -163,7 +163,7 @@ class Journal < ActiveRecord::Base # Description 公共表中需要保存一份该记录 def act_as_forge_activity self.forge_acts << ForgeActivity.new(:user_id => self.user_id, - :project_id => self.issue.project.id) + :project_id => self.issue.project.id) end diff --git a/app/models/user.rb b/app/models/user.rb index 1cd0675c8..12ce8719f 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -258,7 +258,7 @@ class User < Principal ###添加留言 fq def add_jour(user, notes, reference_user_id = 0, options = {}) if options.count == 0 - self.journals_for_messages << JournalsForMessage.new(:user_id => user.id, :notes => notes, :reply_id => reference_user_id, :status => true) + self.journals_for_messages << JournalsForMessage.new(:user_id => user.id, :notes => notes, :reply_id => reference_user_id, :status => true, :is_readed => false) else jfm = self.journals_for_messages.build(options) jfm.save @@ -294,7 +294,7 @@ class User < Principal # 查询用户未读过的记录 def count_new_jour - count = self.journals_for_messages.where("status=?", 1).count + count = self.journals_for_messages.where("status=? and is_readed = ? " ,1, 0).count end #added by nie