From dd33210d05f181aeac75a30c759e57f79f01fb42 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 30 Jun 2015 10:35:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=88=86=E7=BC=BA=E9=99=B7=E5=9B=9E?= =?UTF-8?q?=E5=A4=8D=E5=90=88=E4=B8=BB=E8=B4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/mailer.rb | 2 +- app/views/issues/_edit.html.erb | 2 +- app/views/issues/_history.html.erb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/mailer.rb b/app/models/mailer.rb index 0d0b82752..340559828 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -186,7 +186,7 @@ class Mailer < ActionMailer::Base @course_journal_messages = JournalsForMessage.find_by_sql("select DISTINCT jfm.* from journals_for_messages jfm, members m, courses c where m.user_id = '#{user.id}' and c.id = m.course_id and jfm.jour_id = c.id and jfm.jour_type='Course' and (jfm.created_on between '#{date_from}' and '#{date_to}') order by created_on desc") - + @user_journal_messages = user.journals_for_messages.where("jour_type='Principal' and (created_on between '#{date_from}' and '#{date_to}')").order('created_on DESC') # 查询user在项目中留言（用户反馈） diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb index e4c1290aa..f7594d000 100644 --- a/app/views/issues/_edit.html.erb +++ b/app/views/issues/_edit.html.erb @@ -5,7 +5,7 @@ <% if @edit_allowed || !@allowed_statuses.empty? %>