jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

项目动态

This commit is contained in:
cxt 2016-04-08 14:38:35 +08:00
parent 4621d99a1c
commit eee7b89388
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/api/mobile/entities/activity.rb
View File

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

2
public/javascripts/wechat/app.js
View File

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