Merge branch 'develop' into educoder

dev_library
jingquan huang 6 years ago
commit 246c23660c

@ -9,7 +9,7 @@ class TrainingsController < ApplicationController
before_filter :authenticate, except: [:auth, :auth_callback, :pay_callback] before_filter :authenticate, except: [:auth, :auth_callback, :pay_callback]
before_filter :find_tag_id before_filter :find_tag_id, only: [:show, :create, :update, :enroll, :test]
before_filter :find_training, only: [:show, :test] before_filter :find_training, only: [:show, :test]
@ -270,7 +270,7 @@ class TrainingsController < ApplicationController
def authenticate def authenticate
if Rails.env.development? if Rails.env.development?
# session[:wechat_open_id] = "o5fSc0607iR3rp4-h_VnuBTp8CiM" session[:wechat_open_id] = "o5fSc0607iR3rp4-h_VnuBTp8CiM"
end end
unless session[:wechat_open_id].present? unless session[:wechat_open_id].present?

Loading…
Cancel
Save