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

app/api/mobile/entities/activity.rb

@@ -38,18 +38,16 @@ module Mobile
                     elsif ac.act_type == "Message" || ac.act_type == "Issue"
                       ac.act.subject unless ac.nil? || ac.act.nil?
                     elsif ac.act_type == "JournalsForMessage"
-                      ac.act.private == 0 ? "留言" : "私信"
+                      ac.act.private == 0 ? "留言" : "私信" unless ac.nil? || ac.act.nil?
                     end
                   end
                 when :description
-                  unless ac.act.nil?
-                    if ac.act_type == "HomeworkCommon" || ac.act_type == "Issue" || ac.act_type == "News"
-                      ac.act.description unless ac.nil? || ac.act.nil?
-                    elsif ac.act_type == "Message" || ac.act_type == "BlogComment"
-                      ac.act.content unless ac.nil? || ac.act.nil?
-                    elsif ac.act_type == "JournalsForMessage"
-                      ac.act.notes
-                    end
+                  if ac.act_type == "HomeworkCommon" || ac.act_type == "Issue" || ac.act_type == "News"
+                    ac.act.description unless ac.nil? || ac.act.nil?
+                  elsif ac.act_type == "Message" || ac.act_type == "BlogComment"
+                    ac.act.content unless ac.nil? || ac.act.nil?
+                  elsif ac.act_type == "JournalsForMessage"
+                    ac.act.notes unless ac.nil? || ac.act.nil?
                   end
                 when :latest_update
                   time_from_now ac.updated_at unless ac.nil?

public/javascripts/wechat/app.js

@@ -10,7 +10,7 @@ app.factory('auth', function($http,$routeParams, $cookies, $q){
     var _openid = 'oCnvgv1erQGHzv5GlNZ3sxa2hnSo';
 
     if(debug===true){
-        _openid = "1";
+        _openid = "3";
     }
 
     var getOpenId = function() {