From 635d49cc2575adbfe823dcee21db28b4ffe83b61 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 6 May 2016 22:57:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?course->=E8=AF=BE=E7=A8=8B=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=20project->=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/organizations/_org_subfield_leftM1.html.erb | 8 ++++----
 app/views/organizations/_org_subfield_leftMD.html.erb | 8 ++++----
 app/views/organizations/_org_subfield_rightT.html.erb | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/views/organizations/_org_subfield_leftM1.html.erb b/app/views/organizations/_org_subfield_leftM1.html.erb
index ec9523131..4e1eebb94 100644
--- a/app/views/organizations/_org_subfield_leftM1.html.erb
+++ b/app/views/organizations/_org_subfield_leftM1.html.erb
@@ -3,11 +3,11 @@
     <% case field.name %>
     <% when 'course' %>
         <% if @course_acts.blank? %>
-            <h2 class="h2-title"><%= field.name %></h2>
+            <h2 class="h2-title">课程动态</h2>
             <div class="cl"></div>
             <%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %>
         <% else %>
-            <h2 class="h2-title"><%= field.name %></h2>
+            <h2 class="h2-title">课程动态</h2>
             <div class="cl"></div>
             <% @course_acts.first(1).each do |act| %>
                 <% if act.org_act_type == "HomeworkCommon" %>
@@ -95,11 +95,11 @@
         <% end %>
     <% when 'project' %>
         <% if @project_acts.blank? %>
-            <h2 class="h2-title"><%= field.name %></h2>
+            <h2 class="h2-title">项目动态</h2>
             <div class="cl"></div>
             <%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %>
         <% else %>
-            <h2 class="h2-title"><%= field.name %></h2>
+            <h2 class="h2-title">项目动态</h2>
             <div class="cl"></div>
             <% @project_acts.first(1).each do |act| %>
                 <% if act.org_act_type == "Issue" %>
diff --git a/app/views/organizations/_org_subfield_leftMD.html.erb b/app/views/organizations/_org_subfield_leftMD.html.erb
index e9c20d4bb..faec87015 100644
--- a/app/views/organizations/_org_subfield_leftMD.html.erb
+++ b/app/views/organizations/_org_subfield_leftMD.html.erb
@@ -4,7 +4,7 @@
       <% when 'course' %>
           <% if @course_acts.blank? %>
               <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
-                <h2 class="h2-title"><%= field.name %></h2>
+                <h2 class="h2-title">课程动态</h2>
                 <div class="sn-index-resourcescon">
                     <%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %>
                     <div class="cl"></div>
@@ -12,7 +12,7 @@
               </div>
           <% else %>
               <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
-                <h2 class="h2-title"><%= field.name %></h2>
+                <h2 class="h2-title">课程动态</h2>
                 <div class="sn-index-resourcescon">
                   <% @course_acts.first(4).each do |act| %>
                       <% if act.org_act_type == "HomeworkCommon" %>
@@ -106,7 +106,7 @@
       <% when 'project' %>
           <% if @project_acts.blank? %>
               <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
-                <h2 class="h2-title"><%= field.name %></h2>
+                <h2 class="h2-title">项目动态</h2>
                 <div class="sn-index-resourcescon">
                   <%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %>
                   <div class="cl"></div>
@@ -114,7 +114,7 @@
               </div>
           <% else %>
               <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
-                <h2 class="h2-title"><%= field.name %></h2>
+                <h2 class="h2-title">项目动态</h2>
                 <div class="sn-index-resourcescon">
                   <% @project_acts.first(4).each do |act| %>
                       <% if act.org_act_type == "Issue" %>
diff --git a/app/views/organizations/_org_subfield_rightT.html.erb b/app/views/organizations/_org_subfield_rightT.html.erb
index 0dc1ac583..f28c3fdbb 100644
--- a/app/views/organizations/_org_subfield_rightT.html.erb
+++ b/app/views/organizations/_org_subfield_rightT.html.erb
@@ -3,13 +3,13 @@
     <% when 'course' %>
         <% if @course_acts.blank? %>
             <div class="sn-index-activebox" style="display:<%= field.hide == 0?'block':'none' %>;">
-              <h2 class="h2-title mb18"><%= field.name %></h2>
+              <h2 class="h2-title mb18">课程动态</h2>
               <%= render :partial => 'organizations/org_subfield_rightT_default', :locals => {:field => field} %>
               <div class="cl"></div>
             </div>
         <% else %>
             <div class="sn-index-activebox" style="display:<%= field.hide == 0?'block':'none' %>;">
-              <h2 class="h2-title mb18"><%= field.name %></h2>
+              <h2 class="h2-title mb18">课程动态</h2>
               <% @course_acts.first(4).each do |act| %>
                   <% if act.org_act_type == "HomeworkCommon" %>
                       <% activity = HomeworkCommon.find(act.org_act_id) %>
@@ -88,13 +88,13 @@
     <% when 'project' %>
         <% if @project_acts.blank? %>
             <div class="sn-index-activebox" style="display:<%= field.hide == 0?'block':'none' %>;">
-              <h2 class="h2-title mb18"><%= field.name %></h2>
+              <h2 class="h2-title mb18">项目动态</h2>
               <%= render :partial => 'organizations/org_subfield_rightT_default', :locals => {:field => field} %>
               <div class="cl"></div>
             </div>
         <% else %>
             <div class="sn-index-activebox" style="display:<%= field.hide == 0?'block':'none' %>;">
-              <h2 class="h2-title mb18"><%= field.name %></h2>
+              <h2 class="h2-title mb18">项目动态</h2>
               <% @project_acts.first(4).each do |act| %>
                   <% if act.org_act_type == "Issue" %>
                       <% activity = Issue.find(act.org_act_id) %>

From 18b70e9dd3d0d625927bccf66e487506f6ef841d Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 6 May 2016 22:59:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/words_controller.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb
index 86a78708b..e17f03c38 100644
--- a/app/controllers/words_controller.rb
+++ b/app/controllers/words_controller.rb
@@ -276,7 +276,8 @@ class WordsController < ApplicationController
             ids = params[:asset_id].split(',')
             update_kindeditor_assets_owner ids,feedback[:id],OwnerTypeHelper::JOURNALSFORMESSAGE
           end
-          @homework_common.update_column('updated_at', Time.now)          update_course_activity(@homework_common.class,@homework_common.id)
+          @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)
           respond_to do |format|