课程通知、回复、发布缺陷、回复合二为一

app/views/mailer/send_for_user_activities.html.erb

@@ -7,7 +7,7 @@
     <div class="wmail_main" style="padding:20px 10px 0px;">
       <h3 class="wmail_h2" style="color:#15bccf; "><%= l(:label_course_overview)%></h3>
       <!-- 课程通知 -->
-      <% unless @course_news.first.nil? %>
+      <% unless @course_news.first.nil? || @course_news_comments.first.nil? %>
           <ul class="wmail_ul" style=" list-style-type:none;clear: both;margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:1020px; margin-bottom:15px;">
             <span class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
               <%= l(:label_course_news) %>
@@ -33,15 +33,7 @@
                 </li>
             <% end %>
             <div class="cl"></div>
-          </ul><!--课程通知 end-->
-      <% end %>
-
             <!--课程通知回复-->
-      <% unless @course_news_comments.first.nil? %>
-          <ul class="wmail_ul" style=" list-style-type:none;clear: both;margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:1020px; margin-bottom:15px;">
-            <span class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
-              <%= l(:label_course_mail_news_reply) %>
-            </span>
             <% @course_news_comments.each do |course_news_comment|%>
                 <li style="clear: both; list-style: none;">
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
@@ -65,7 +57,7 @@
                 </li>
             <% end %>
             <div class="cl"></div>
-          </ul><!--课程通知回复 end-->
+          </ul><!--课程通知 end-->
       <% end %>
 
       <!--课程作业-->
@@ -198,7 +190,7 @@
         @project_news_comments.first  %>
     <div class="wmail_main" style="padding:20px 10px 0px;">
       <h3 class="wmail_h2" style="color:#15BCCF; "><%= l(:label_project_overview_new)%></h3>
-      <% unless @issues.first.nil? %>
+      <% unless @issues.first.nil? || @issues_journals.first.nil? %>
           <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:1020px; margin-bottom:15px;">
             <span class="wmail_h4" style="color:#666; font-size:14px; margin-bottom:5px;" >
               <%= l(:label_issue_tracking) %>
@@ -220,18 +212,7 @@
                   <span class="wmail_date" style="color:#6e6e6e; float:left;display:block; margin-left:40px;"><%= format_time(issue.created_on) %></span>
                 </li>
             <% end %>
-
             <div class="cl"></div>
-          </ul><!--问题跟踪 end-->
-      <% end %>
-
-      <!-- issues回复 -->
-
-      <% unless @issues_journals.first.nil? %>
-        <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:1020px; margin-bottom:15px;">
-            <span class="wmail_h4" style="color:#666; font-size:14px; margin-bottom:5px;" >
-              <%= l(:label_issue_tracking) %>
-            </span>
             <% @issues_journals.each do |issues_journal| %>
                 <li style="clear: both; list-style: none;">
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
@@ -253,7 +234,6 @@
                   <span class="wmail_date" style="color:#6e6e6e; float:left;display:block; margin-left:40px;"><%= format_time(issues_journal.created_on) %></span>
                 </li>
             <% end %>
-
             <div class="cl"></div>
           </ul><!--问题跟踪 end-->
       <% end %>
@@ -322,7 +302,7 @@
       <% end %>
 
       <!--项目新闻-->
-      <% unless @project_news.first.nil? %>
+      <% unless @project_news.first.nil? || @project_news_comments.first.nil? %>
           <ul class="wmail_ul" style=" list-style-type:none;clear: both;margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:1020px; margin-bottom:15px;">
             <span class="wmail_h4" style="color:#666; font-size:14px; margin-bottom:5px;" >
               <%= l(:label_project_news) %>
@@ -347,15 +327,6 @@
                 </li>
             <% end %>
             <div class="cl"></div>
-          </ul><!-- 项目新闻end -->
-      <% end %>
-
-      <!-- 项目新闻回复 -->
-      <% unless @project_news_comments.first.nil? %>
-          <ul class="wmail_ul" style=" list-style-type:none;clear: both;margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:1020px; margin-bottom:15px;">
-            <span class="wmail_h4" style="color:#666; font-size:14px; margin-bottom:5px;" >
-              <%= l(:label_project_news) %>
-            </span>
             <% @project_news_comments.each do |project_news_comment|%>
                 <li style="clear: both; list-style: none;">
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
@@ -377,7 +348,7 @@
                 </li>
             <% end %>
             <div class="cl"></div>
-          </ul><!-- 项目新闻回复end -->
+          </ul><!-- 项目新闻end -->
       <% end %>
 
       <!-- 项目上传资源 -->

config/locales/courses/zh.yml

@@ -20,7 +20,7 @@ zh:
   label_course_mail_news_reply: 课程通知回复
   label_main_teacher: 主讲教师
   label_course_term: 开课学期
-  label_isuue_mail_status: 更新了issue状态
+  label_isuue_mail_status: 更新了issue状态！
 
   label_join_course: 加入
   label_exit_course: 退出