Merge branch 'dev_trainings' into develop

6 years ago · 3f6bf8d1f6
parent e5dd2e40b7 e762fb336d
commit 3f6bf8d1f6
1 changed files with 4 additions and 4 deletions
--- a/app/controllers/trainings_controller.rb
+++ b/app/controllers/trainings_controller.rb
@ -5,10 +5,10 @@ class TrainingsController < ApplicationController

  skip_before_filter :verify_signature, only: [:show, :create, :test]

-  # ROOT_URL = ENV["wechat_url"] || "#{Setting.protocol}://#{Setting.host_name}"
-  #
-  # before_filter :authenticate, except: [:auth, :auth_callback, :pay_callback]
-  #
+  ROOT_URL = ENV["wechat_url"] || "#{Setting.protocol}://#{Setting.host_name}"
+
+  before_filter :authenticate, except: [:auth, :auth_callback, :pay_callback]
+
  before_filter :find_tag_id

  before_filter :find_training, only: [:show, :test]