From f5a498a5950d64d7fb0d61ef711d3b7357174391 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 27 Oct 2015 09:29:54 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=8A=A0=E5=85=A5=E8=AF=BE=E7=A8=8B=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=8F=91=E9=80=81=E9=82=AE=E4=BB=B6=EF=BC=9B=202.?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3360=E6=B5=8F=E8=A7=88=E5=99=A8=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E6=AD=A3=E7=A1=AE=E6=98=BE=E7=A4=BA=E2=80=9C=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E8=AF=84=E9=98=85=E4=BA=86=E4=BD=9C=E5=93=81=E2=80=9D?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/courses_service.rb               | 2 ++
 app/views/users/_user_message_course.html.erb | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index fb01e0398..b388b660c 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -317,6 +317,7 @@ class CoursesService
             elsif current_user.allowed_to?(:as_teacher,course)
               @state = 3
             else
+              Mailer.run.join_course_request(course, User.current, params[:role])
               #如果加入角色为教师或者教辅
               CourseMessage.create(:user_id => course.tea_id, :course_id => course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest',:status=>0)
               @state = 6
@@ -337,6 +338,7 @@ class CoursesService
               if CourseMessage.where("course_message_type = 'JoinCourseRequest' and user_id = #{course.tea_id} and content = #{params[:role]} and course_message_id = #{User.current.id} and course_id = #{course.id} and status = 0").count != 0
                 @state = 7
               else
+                Mailer.run.join_course_request(course, User.current, params[:role])
                 CourseMessage.create(:user_id => course.tea_id, :course_id => course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest',:status=>0)
                 @state = 6
               end
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index 2398fd8c5..afbeb5ed5 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -309,7 +309,7 @@
                     <% content = ma.content.gsub("作业评分：","").split("&nbsp;&nbsp;&nbsp; 评语：")%>
                     <li>作品评分：<span style="color:Red;"><%= content[0] %>分</span></li>
                     <% if content.size > 1 %>
-                        <div class="fl"><li>作品评语：</li></div>
+                        <div class="fl" style="width:74px;"><li>作品评语：</li></div>
                         <div style="margin-left:74px"><span style="color:Red;"><%= content[1] %></span></div>
                     <% end %>
                   </ul>