diff --git a/app/models/mailer.rb b/app/models/mailer.rb index e6b091dd4..20cf91aa4 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -107,6 +107,11 @@ class Mailer < ActionMailer::Base and (i.updated_on between '#{date_from}' and '#{date_to}') order by i.updated_on desc" @issues = Issue.find_by_sql(sql) + # issue回复 + @issues_journals = Journal.find_by_sql("select j.* from journals j, members m, projects p, issues i + where m.user_id = '#{user.id}' and p.id = m.project_id and i.project_id = p.id and j.journalized_id = i.id + and j.journalized_type='Issue' and (j.created_on between '#{date_from}' and '#{date_to}') order by updated_on desc") + # @bids 查询课程作业,包括老师发布的作业,以及user提交作业 # @attachments查询课程课件更新 @attachments ||= [] diff --git a/app/views/journals/diff.html.erb b/app/views/journals/diff.html.erb index d3dfa7d34..5bc823c76 100644 --- a/app/views/journals/diff.html.erb +++ b/app/views/journals/diff.html.erb @@ -2,7 +2,7 @@
<%= authoring @journal.created_on, @journal.user, :label => :label_updated_time_by %>
<%= link_to l(:button_back), issue_path(@issue), :onclick => 'history.back(); return false;' %>