课程加入消息错误

This commit is contained in:
lizanle 2015-10-24 11:11:49 +08:00
parent 75ee45b2d1
commit 9d89da7e66
3 changed files with 15 additions and 12 deletions

View File

@ -31,21 +31,11 @@ class CoursesController < ApplicationController
def join
if User.current.logged?
# if params[:role] == 10
cs = CoursesService.new
@user = User.current
join = cs.join_course params,@user
@state = join[:state]
@course = join[:course]
# else
# if params[:course_password] == course.password
# @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')
# @state = 6
# else
# @state = 1 #密码错误
# end
# end
else
@state = 5 #未登录
end

View File

@ -309,17 +309,21 @@ class CoursesService
@state = 2
else
if current_user.member_of_course?(course) #如果已经是成员
if params[:course_password] == course.password
#如果加入角色为学生
if params[:role] == 10
if params[:role] == "10"
@state = 3
else
#如果加入角色为教师或者教辅
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
else
@state = 1
end
else
if params[:course_password] == course.password
if params[:role] == 10
if params[:role] == "10"
members = []
members << Member.new(:role_ids => [10], :user_id => current_user.id)
course.members << members

View File

@ -391,6 +391,15 @@ RedmineApp::Application.routes.draw do
get 'dealwith_apply_request'
# end
end
#resources :blogs
resources :blogs do
resources :blog_comments do
member do
post 'reply'
get 'quote'
end
end
end
end
match 'users/:id/user_newfeedback', :to => 'users#user_newfeedback', :via => :get, :as => "feedback"
match 'users/:id/user_projects', :to => 'users#user_projects', :via => :get