From 268575ceeceab537184650bfb240ee52a2f55f84 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Tue, 27 Oct 2015 11:01:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=AF=BE=E7=A8=8B=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 1 - app/views/mailer/join_course_request.html.erb | 18 ++++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index a49126a6c..042311961 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -37,7 +37,6 @@ class CoursesController < ApplicationController join = cs.join_course params,@user @state = join[:state] @course = join[:course] - Mailer.run.join_course_request(@course, User.current, params[:role]) # else # @course = Course.find_by_id params[:object_id] # 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') diff --git a/app/views/mailer/join_course_request.html.erb b/app/views/mailer/join_course_request.html.erb index 680b9c9df..61b7eaa6f 100644 --- a/app/views/mailer/join_course_request.html.erb +++ b/app/views/mailer/join_course_request.html.erb @@ -1,4 +1,14 @@ -

- <%= @user.show_name %>申请成为课程<%= @course.name %>的<%= @role.eql?('9') ? '老师': '教辅' %> - <%=link_to user_message_url(@receive),user_message_url(@receive)%> -

+
+ + +
+