From e1a7ebd95f54a327e2d9f466e5a2adac2c4a74d7 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Thu, 29 Oct 2015 10:50:19 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=B6=88=E6=81=AF=E6=8F=90=E7=A4=BA=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_message_course.html.erb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb index ed0147be8..a6086b888 100644 --- a/app/views/users/_user_message_course.html.erb +++ b/app/views/users/_user_message_course.html.erb @@ -426,10 +426,16 @@

课程名称：<%= ma.course_message.name %>

开课学期：<%= ma.course_message.time.to_s + '年' + ma.course_message.term %>

-
课程描述：
-
<%= ma.course_message.description.html_safe %>
-

学时总数：<%= ma.course_message.class_period%>

+

课程ID：<%= ma.course_message.id %>

+

课程密码：<%= ma.course_message.password %>

+

学时总数：<%= ma.course_message.class_period %>

创建时间：<%= format_time(ma.course_message.created_at) %>

+

您可以点击左上角的“配置”按钮，修改课程基本信息，添加及删除课程成员。您也可以把课程ID及密码告诉学生和其他成员，让他们输入ID及密码加入课程。

+ <% if ma.course_message.is_public %> +

您的课程是公开的，所有人都能访问您的课程。若不想设置为公开，您可以在配置中设置。

+ <% else %> +

您的课程是私有的，非课程成员不能访问您的课程。如果想设置为公开，您可以在配置中设置。

+ <% end %>
  • <%= time_tag(ma.created_at).html_safe %>
    • From f26707e38148a7c55ec70636870391b4fedbfab3 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Thu, 29 Oct 2015 15:38:57 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E6=88=90=E5=91=98=EF=BC=8C=E7=BB=99=E8=AF=A5=E8=80=81=E5=B8=88?= =?UTF-8?q?=E4=B9=9F=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF=EF=BC=9B=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A2=9E=E5=8A=A0=E6=88=90=E5=91=98=E6=88=96?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=88=90=E5=91=98=E6=B6=88=E6=81=AF=E7=9A=84?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/members_controller.rb | 4 +- app/views/users/_user_message_course.html.erb | 50 +++++++++++++++++-- app/views/users/_user_message_forge.html.erb | 4 +- 3 files changed, 49 insertions(+), 9 deletions(-) diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 34e039ae0..4dc2c52f5 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -163,9 +163,9 @@ class MembersController < ApplicationController #给新成员和老师发送加入课程的消息，发送者id放在CourseMessage的course_message_id字段中 #course_message_type设置为JoinCourse #status = 0 表示给学生发，status = 1表示给老师发 - course_join = CourseMessage.new(:user_id =>user_id, :course_message_id=>User.current.id,:course_id => @course.id,:course_message_type=>"JoinCourse", :viewed => false, :status => 0) + course_join = CourseMessage.new(:user_id =>user_id, :course_message_id=>User.current.id,:course_id => @course.id,:course_message_type=>"JoinCourse", :content => role, :viewed => false, :status => 0) course_join.save - CourseMessage.create(:user_id => User.current.id, :course_message_id => user_id, :course_id => @course.id, :course_message_type => "JoinCourse", :viewed => false, status => 1) + CourseMessage.create(:user_id => User.current.id, :course_message_id => user_id, :course_id => @course.id, :course_message_type => "JoinCourse",:content => role, :viewed => false, :status => 1) members << member #user_grades << UserGrade.new(:user_id => user_id, :course_id => @course.id) diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb index a6086b888..678fac93b 100644 --- a/app/views/users/_user_message_course.html.erb +++ b/app/views/users/_user_message_course.html.erb @@ -511,7 +511,7 @@ <% end %> - <% if ma.course_message_type == "JoinCourse" %> + <% if ma.course_message_type == "JoinCourse" and ma.status == 0 %> + <% end %> + + + <% if ma.course_message_type == "JoinCourse" and ma.status == 1 %> +