Merge branch 'dev_trainings' into develop

app/controllers/trainings_controller.rb

@@ -3,7 +3,7 @@ require 'base64'
 class TrainingsController < ApplicationController
   wechat_responder
 
-  skip_before_filter :verify_signature, only: [:show, :create, :test]
+  skip_before_filter :verify_signature, only: [:show, :create, :update, :test, :enroll]
 
   ROOT_URL = ENV["wechat_url"] || "#{Setting.protocol}://#{Setting.host_name}"
 

app/views/trainings/enroll.html.erb

@@ -125,7 +125,7 @@
 <% end %>
 <div>
   <p class="collegeInfo"><%= @training_title %></p>
-  <%= form_for @training do |f| %>
+  <%= form_for (@training || Training.new) do |f| %>
     <%= hidden_field_tag(:tag_id, @tag_id) %>
 
     <p class="subtitle">基本信息</p>