Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange

app/controllers/wechats_controller.rb

@@ -418,12 +418,14 @@ class WechatsController < ActionController::Base
 
       logger.info "user_activities!!!!!!!!!!!!!!"
       logger.info params
+
+      #保证下面的redirect_to "/wechat/user_activities##{@path}?id=...不会往下走
+      if params[:state] == nil
+        return
+      end
       
       unless (user_binded?(open_id) || params[:state] == "invite_code" || params[:state] == "project_invite_code" ||  params[:state] == "blog_comment" || params[:state] == "course_notice" || params[:state] == "project_discussion" || params[:state] == "course_discussion" || params[:state] == "homework" || params[:state] == "issues" || params[:state] == "journal_for_message")
-        if !(session["login"] != nil && session["login"] == false)
-          @path = '/login'
-        end
-        session["login"] = nil
+        @path = '/login'
       else
         if params[:state] == 'myclass'
           @course_id = params[:id];
@@ -433,8 +435,6 @@ class WechatsController < ActionController::Base
 
         session[:wechat_openid] = open_id
         if params[:code]
-          #不跳转至绑定界面的标志
-          session["login"] = false
           if params[:userid]
             redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}&userid=#{params[:userid]}" and return
           elsif params[:id]