diff --git a/app/models/mailer.rb b/app/models/mailer.rb index 7411dd30f..b3aff41d2 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -107,7 +107,6 @@ class Mailer < ActionMailer::Base and (i.created_on between '#{date_from}' and '#{date_to}') order by i.created_on desc" @issues = Issue.find_by_sql(sql) - # @bids 查询课程作业,包括老师发布的作业,以及user提交作业 # @attachments查询课程课件更新 @attachments ||= [] diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb index 54d2db43c..38805d837 100644 --- a/app/views/mailer/send_for_user_activities.html.erb +++ b/app/views/mailer/send_for_user_activities.html.erb @@ -5,61 +5,62 @@ <% if @attachments.first || @course_news.first || @bids.first || @course_journal_messages.first|| @course_messages.first %>
-

<%= l(:label_course_overview)%>

+

<%= l(:label_course_overview)%>

<% unless @course_news.first.nil? %> - <% end %> <% unless @bids.empty? %> -
<% end %> - - <% if @issues.first || @project_messages.first %>
-

<%= l(:label_project_overview_new)%>

+

<%= l(:label_project_overview_new)%>

<% unless @issues.first.nil? %> -