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

This commit is contained in:
Tim 2016-09-08 14:15:10 +08:00
commit 4c33b1d7ba
2 changed files with 10 additions and 5 deletions

View File

@ -189,7 +189,7 @@ module Mobile
reply.content = params[:content]
reply.parent_id = params[:id]
reply.subject = "RE: #{topic.subject}"
if topic.children << reply
if message.children << reply
result = 2
update_id = topic.id
end

View File

@ -30,19 +30,24 @@ module Mobile
u.nil? ? "" : u.show_name
when :roles_id
u[:roles_id].nil? ? nil : u.roles_id
when :login
u.login
when :lastname
u.lastname
when :mail
u.mail
end
end
end
end
end
expose :id
#头像
expose :login
expose :lastname
user_expose :login
user_expose :lastname
#邮箱地址
expose :mail
user_expose :mail
expose :nickname
#真名
user_expose :img_url