From fe6a0fc246ac989f6b9213dfc04a6bd81814e9f7 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 6 Mar 2020 16:18:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=AE=9E=E5=90=8D=E5=92=8C?=
 =?UTF-8?q?=E8=81=8C=E4=B8=9A=E8=AE=A4=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/application_controller.rb | 14 +++++++-------
 app/controllers/courses_controller.rb     | 17 +++++++++--------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 59ec88fc7..15e795bdb 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -95,13 +95,13 @@ class ApplicationController < ActionController::Base
 			check_account
 			tip_exception(@course.excellent ? 410 : 409, "您没有权限进入")
 		end
-		if @user_course_identity > Course::CREATOR && @user_course_identity <= Course::STUDENT && @course.tea_id != current_user.id
-			# 实名认证和职业认证的身份判断
-			tip_exception(411, "你的实名认证和职业认证审核未通过") if @course.authentication &&
-				@course.professional_certification && (!current_user.authentication && !current_user.professional_certification)
-			tip_exception(411, "你的实名认证审核未通过") if @course.authentication && !current_user.authentication
-			tip_exception(411, "你的职业认证审核未通过") if @course.professional_certification && !current_user.professional_certification
-		end
+		# if @user_course_identity > Course::CREATOR && @user_course_identity <= Course::STUDENT && @course.tea_id != current_user.id
+		# 	# 实名认证和职业认证的身份判断
+		# 	tip_exception(411, "你的实名认证和职业认证审核未通过") if @course.authentication &&
+		# 		@course.professional_certification && (!current_user.authentication && !current_user.professional_certification)
+		# 	tip_exception(411, "你的实名认证审核未通过") if @course.authentication && !current_user.authentication
+		# 	tip_exception(411, "你的职业认证审核未通过") if @course.professional_certification && !current_user.professional_certification
+		# end
 		uid_logger("###############user_course_identity:#{@user_course_identity}")
 	end
 
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index f82775235..3283595e5 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -153,8 +153,8 @@ class CoursesController < ApplicationController
     begin
       ActiveRecord::Base.transaction do
         @course = Course.new(name: params[:name], class_period: params[:class_period], credit: params[:credit],
-                             end_date: params[:end_date], is_public: params[:is_public], school_id: @school.id,
-                             authentication: params[:authentication], professional_certification: params[:professional_certification])
+                             end_date: params[:end_date], is_public: params[:is_public], school_id: @school.id)
+                             # authentication: params[:authentication], professional_certification: params[:professional_certification])
         @course.tea_id = current_user.id
 
         if params[:subject_id].blank?
@@ -219,8 +219,8 @@ class CoursesController < ApplicationController
           extra_params[:is_end] = 1
         end
 
-        extra_params[:authentication] = params[:authentication]
-        extra_params[:professional_certification] = params[:professional_certification]
+        # extra_params[:authentication] = params[:authentication]
+        # extra_params[:professional_certification] = params[:professional_certification]
 
         if @course.subject
           @course.start_date = params[:start_date]
@@ -1157,10 +1157,10 @@ class CoursesController < ApplicationController
         return normal_status(-1, "课堂已结束，无法加入") if course.is_end
 
         # 实名认证和职业认证的身份判断
-        return normal_status(-2, "该课堂要求成员完成实名和职业认证") if course.authentication &&
-            course.professional_certification && (!current_user.authentication && !current_user.professional_certification)
-        return normal_status(-2, "该课堂要求成员完成实名认证") if course.authentication && !current_user.authentication
-        return normal_status(-2, "该课堂要求成员完成职业认证") if course.professional_certification && !current_user.professional_certification
+        # return normal_status(-2, "该课堂要求成员完成实名和职业认证") if course.authentication &&
+        #     course.professional_certification && (!current_user.authentication && !current_user.professional_certification)
+        # return normal_status(-2, "该课堂要求成员完成实名认证") if course.authentication && !current_user.authentication
+        # return normal_status(-2, "该课堂要求成员完成职业认证") if course.professional_certification && !current_user.professional_certification
 
         # 身份验证
         if params[:professor].blank? && params[:assistant_professor].blank? && params[:student].blank?
@@ -1452,6 +1452,7 @@ class CoursesController < ApplicationController
   # Never trust parameters from the scary internet, only allow the white list through.
   def course_params
     params.require(:course).permit(:name, :class_period, :credit, :end_date, :is_public, :authentication, :professional_certification)
+    # params.require(:course).permit(:name, :class_period, :credit, :end_date, :is_public, :authentication, :professional_certification)
   end
 
   def validate_course_name