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

app/controllers/words_controller.rb

@@ -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)

public/assets/wechat/activities.html

@@ -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">