Merge remote-tracking branch 'origin/develop' into develop

5 years ago · de1b2944a9
parent b3dda3cde2 956f45c50d
commit de1b2944a9
2 changed files with 2 additions and 2 deletions
--- a/app/controllers/weapps/courses_controller.rb
+++ b/app/controllers/weapps/courses_controller.rb
@ -1,5 +1,5 @@
 class Weapps::CoursesController < Weapps::BaseController
-  # before_action :require_wechat_login!
+  before_action :require_login
  before_action :teacher_allowed, except: [:create, :show, :shixun_homework_category]

  def create
--- a/app/controllers/weapps/homes_controller.rb
+++ b/app/controllers/weapps/homes_controller.rb
@ -1,5 +1,5 @@
 class Weapps::HomesController < Weapps::BaseController
-  before_action :require_wechat_login!
+  before_action :require_login

  def show
    # banner