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

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

This commit is contained in:
guange 2016-04-08 14:51:46 +08:00
parent c5b1ffb42f c5048d7c72
commit 8dc47c9bd3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/words_controller.rb
View File

@ -276,7 +276,7 @@ class WordsController < ApplicationController
ids = params[:asset_id].split(',')
update_kindeditor_assets_owner ids,feedback[:id],OwnerTypeHelper::JOURNALSFORMESSAGE
end
@homework_common.update_attributes(:updated_at => Time.now)
@homework_common.update_column(:updated_at, Time.now)
update_course_activity(@homework_common.class,@homework_common.id)
update_user_activity(@homework_common.class,@homework_common.id)
update_org_activity(@homework_common.class,@homework_common.id)

2
public/assets/wechat/activities.html
View File

@ -189,7 +189,7 @@
</div>
</div>
<div ng-if="act.act_type=='Blog'">
<div ng-if="act.act_type=='BlogComment'">
<div class="post-container">
<div class="post-wrapper">
<div class="post-main">